From 1d92f653e2bf1174d5d1d101ee0bbbd2103ecf4a Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期三, 12 三月 2025 08:34:41 +0800
Subject: [PATCH] 通信

---
 项目代码/WIDESEAWCS_Server 正式/WIDESEAWCS_SystemServices/Sys_UserService.cs |   24 +++++++++++++++++++++++-
 1 files changed, 23 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 ad0e35f..dc621e1 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
 {
@@ -20,13 +21,17 @@
         private readonly ICacheService _cacheService;
         private readonly ISys_MenuService _menuService;
         private readonly ISys_RoleRepository _RoleRepository;
-        public Sys_UserService(ISys_UserRepository repository, IUnitOfWorkManage unitOfWorkManage, ICacheService cacheService, ISys_MenuService menuService , ISys_RoleRepository roleRepository) : base(repository)
+        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)
@@ -50,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);
@@ -61,6 +67,10 @@
                     {
                         return WebResponseContent.Instance.Error("鏃犵櫥褰曟潈闄�");
                     }
+                    if (disbled.Enable!=1)
+                    {
+                        return WebResponseContent.Instance.Error("浣犵殑璐﹀彿宸茶绂佺敤锛岃鑱旂郴绠$悊鍛�");
+                    }
 
                     string token = JwtHelper.IssueJwt(new TokenModelJwt()
                     {
@@ -69,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 });
                 }
@@ -200,6 +221,7 @@
                     r => r.RoleId,
                     (u, r) => new
                     {
+                        u.User_Id,
                         u.UserName,
                         r.RoleId,
                         u.RoleName,

--
Gitblit v1.9.3