From 0a430c14f3e3ceb4ba63462c4f2c92768fc79e87 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期三, 12 三月 2025 19:04:26 +0800
Subject: [PATCH] 美型
---
项目代码/WIDESEAWCS_Server 正式/WIDESEAWCS_SystemServices/Sys_UserService.cs | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 55 insertions(+), 1 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_SystemServices/Sys_UserService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_SystemServices/Sys_UserService.cs"
index 2c740c4..bfa5d7a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_SystemServices/Sys_UserService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_SystemServices/Sys_UserService.cs"
@@ -11,6 +11,7 @@
using WIDESEAWCS_Core.BaseRepository;
using System.Net;
using WIDESEAWCS_Core.Caches;
+using WIDESEA_ISerialPortRepository;
namespace WIDESEAWCS_SystemServices
{
@@ -19,11 +20,18 @@
private readonly IUnitOfWorkManage _unitOfWorkManage;
private readonly ICacheService _cacheService;
private readonly ISys_MenuService _menuService;
- public Sys_UserService(ISys_UserRepository repository, IUnitOfWorkManage unitOfWorkManage, ICacheService cacheService, ISys_MenuService menuService) : base(repository)
+ private readonly ISys_RoleRepository _RoleRepository;
+ private readonly ILoginHistoryRepository _loginHistoryRepository;
+ public Sys_UserService(ISys_UserRepository repository, IUnitOfWorkManage unitOfWorkManage,
+ ICacheService cacheService, ISys_MenuService menuService , ISys_RoleRepository roleRepository, ILoginHistoryRepository loginHistoryRepository) : base(repository)
{
_unitOfWorkManage = unitOfWorkManage;
_cacheService = cacheService;
_menuService = menuService;
+ _RoleRepository = roleRepository;
+ _RoleRepository= roleRepository;
+ _loginHistoryRepository = loginHistoryRepository;
+
}
public WebResponseContent Login(LoginInfo loginInfo)
@@ -47,6 +55,7 @@
#endregion
UserInfo user = BaseDal.GetUserInfo(loginInfo.UserName, loginInfo.Password);
+ var disbled = BaseDal.QueryFirst(x => x.UserName == loginInfo.UserName);//鏍规嵁杩欎釜鐢ㄦ埛鍚嶆潵鏌ョ湅鐢ㄦ埛
if (user != null)
{
object obj = _menuService.GetMenuActionList(user.RoleId);
@@ -58,6 +67,10 @@
{
return WebResponseContent.Instance.Error("鏃犵櫥褰曟潈闄�");
}
+ if (disbled.Enable!=1)
+ {
+ return WebResponseContent.Instance.Error("浣犵殑璐﹀彿宸茶绂佺敤锛岃鑱旂郴绠＄悊鍛�");
+ }
string token = JwtHelper.IssueJwt(new TokenModelJwt()
{
@@ -66,8 +79,19 @@
UserName = user.UserName,
TenantId = user.TenantId,
});
+ var loghis = new Dt_LoginHistory
+ {
+ Account = user.UserName,
+ TrurName=user.UserTrueName,
+ CreateDate=DateTime.Now
+
+
+
+ };
+
_cacheService.AddOrUpdate(user.UserId.ToString(), token);
+ _loginHistoryRepository.AddData(loghis);
content = WebResponseContent.Instance.OK(data: new { token, userName = user.UserTrueName, img = user.HeadImageUrl });
}
@@ -183,5 +207,35 @@
}
return content;
}
+
+ public WebResponseContent GetUerType()
+ {
+ try
+ {
+ var role = _RoleRepository.QueryData();
+ var user = BaseDal.QueryData();
+
+ var result = user.Join(
+ role,
+ u => u.Role_Id,
+ r => r.RoleId,
+ (u, r) => new
+ {
+ u.User_Id,
+ u.UserName,
+ r.RoleId,
+ u.RoleName,
+ u.UserTrueName,
+ }).ToList();
+
+ return new WebResponseContent { Status = true, Data = result };
+ }
+ catch (Exception ex)
+ {
+
+
+ return new WebResponseContent { Status = false, Message="澶辫触"+ex };
+ }
+ }
}
}
--
Gitblit v1.9.3