From c2dc27fe0095dfeaeac41cae3b908dcd472d2dd8 Mon Sep 17 00:00:00 2001
From: admin <qiutairan163@163.com>
Date: 星期二, 02 十二月 2025 11:23:32 +0800
Subject: [PATCH] 登录返回用户真实姓名

---
 Wms/Model/ModelDto/SysDto/UserDto.cs             |   24 ++++++++++++
 Wms/Wms/Controllers/WeatherForecastController.cs |   20 ++++++---
 Wms/WMS.BLL/SysServer/UserInforServer.cs         |   22 ++++++++--
 Wms/WMS.IBLL/ISysServer/IUserInforServer.cs      |    2 
 4 files changed, 55 insertions(+), 13 deletions(-)

diff --git a/Wms/Model/ModelDto/SysDto/UserDto.cs b/Wms/Model/ModelDto/SysDto/UserDto.cs
new file mode 100644
index 0000000..d357d14
--- /dev/null
+++ b/Wms/Model/ModelDto/SysDto/UserDto.cs
@@ -0,0 +1,24 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model.ModelDto.SysDto
+{
+    /// <summary>
+    /// 鐢ㄦ埛dto
+    /// </summary>
+    public class UserDto
+    {
+        /// <summary>
+        /// 鐢ㄦ埛token
+        /// </summary>
+        public string Token { get; set; }
+
+        /// <summary>
+        /// 鐪熷疄濮撳悕
+        /// </summary>
+        public string RealName { get; set; }
+
+    }
+
+}
diff --git a/Wms/WMS.BLL/SysServer/UserInforServer.cs b/Wms/WMS.BLL/SysServer/UserInforServer.cs
index 9a955fc..56e7168 100644
--- a/Wms/WMS.BLL/SysServer/UserInforServer.cs
+++ b/Wms/WMS.BLL/SysServer/UserInforServer.cs
@@ -35,8 +35,10 @@
         }
 
 
-        public async Task<int> LoginAdmin(string loginName, string loginPwd)
+        public async Task<UserInfoDto> LoginAdmin(string loginName, string loginPwd)
         {
+            UserInfoDto userDto = new UserInfoDto();
+
             //鏌ヨ瀵嗙爜宸查敊璇鏁�
             string pwdErrNumSql = $@"select PwdErrNum from SysUserInfor where UserName='{loginName}'";
             int pwdErrNum = Db.Ado.GetInt(pwdErrNumSql);
@@ -59,11 +61,16 @@
 
                         //鏈�鍚庣櫥闄嗘椂闂�
                         await Db.Updateable(modUser).UpdateColumns(s => s.LoginTime == DateTime.Now).ExecuteCommandAsync();
-                        return modUser.Id;
+
+                        userDto.Id = modUser.Id;
+                        userDto.RealName = modUser.RealName;
+                        return userDto;
                     }
                     else //褰撳墠璐﹀彿琚鐢�
                     {
-                        return 0;
+                        userDto.Id = 0;
+                        userDto.RealName = "";
+                        return userDto;
                     }
                 }
                 else //璐﹀彿瀵嗙爜涓嶆纭垨娌℃湁姝よ处鍙�
@@ -72,7 +79,9 @@
                     string addErrNumSql = $@"update SysUserInfor set PwdErrNum+=1 where UserName='{loginName}'";
                     int addErrNum = Db.Ado.ExecuteCommand(addErrNumSql);
 
-                    return -1;
+                    userDto.Id = -1;
+                    userDto.RealName = "";
+                    return userDto;
                 }
             }
             else//閿佸畾璐﹀彿
@@ -80,7 +89,10 @@
                 //璐﹀彿鏀逛负鍋滅敤
                 string uptUserStatusSql = $@"update SysUserInfor set Status=1 where UserName='{loginName}'";
                 int uptUserStatus = Db.Ado.ExecuteCommand(uptUserStatusSql);
-                return -2;
+
+                userDto.Id = -2;
+                userDto.RealName = "";
+                return userDto;
             }
 
         }
diff --git a/Wms/WMS.IBLL/ISysServer/IUserInforServer.cs b/Wms/WMS.IBLL/ISysServer/IUserInforServer.cs
index ee85053..73d7332 100644
--- a/Wms/WMS.IBLL/ISysServer/IUserInforServer.cs
+++ b/Wms/WMS.IBLL/ISysServer/IUserInforServer.cs
@@ -9,7 +9,7 @@
 {
     public interface IUserInforServer
     {
-        Task<int> LoginAdmin(string loginName, string loginPwd);
+        Task<UserInfoDto> LoginAdmin(string loginName, string loginPwd);
 
         /// <summary>
         /// 鑾峰彇鐢ㄦ埛瑙掕壊淇℃伅
diff --git a/Wms/Wms/Controllers/WeatherForecastController.cs b/Wms/Wms/Controllers/WeatherForecastController.cs
index 6e8d005..d489ce1 100644
--- a/Wms/Wms/Controllers/WeatherForecastController.cs
+++ b/Wms/Wms/Controllers/WeatherForecastController.cs
@@ -7,6 +7,7 @@
 using WMS.IBLL.ISysServer;
 using Wms.Tools;
 using Utility;
+using Model.ModelDto.SysDto;
 
 namespace Wms.Controllers
 {
@@ -53,23 +54,28 @@
         /// <param name="model">鐧诲綍鍚�</param> 
         /// <returns></returns>
         [HttpPost]
-        public async Task<string> Login(LoginVm model)
+        public async Task<UserDto> Login(LoginVm model)
         {
             if (ModelState.IsValid)
             {
-                var userId = await _userMan.LoginAdmin(model.LoginName, model.LoginPwd);
+                var user = await _userMan.LoginAdmin(model.LoginName, model.LoginPwd);
+                UserDto dto = new UserDto();
 
-                if (userId != -1 && userId != -2) //
+                if (user.Id != -1 && user.Id != -2) //
                 {
-                    if (userId != 0) //姝g‘杩斿洖
+                    if (user.Id != 0) //姝g‘杩斿洖
                     {
                         Dictionary<string, string> keyValuePairs = new Dictionary<string, string>
                         {
-                            {"loginID", userId.ToString()},
+                            {"loginID", user.Id.ToString()},
                             {"LoginName", model.LoginName}
                         };
                         var tnToken = tokenHelper.CreateToken(keyValuePairs);
-                        return tnToken.TokenStr;
+
+                        dto.Token = tnToken.TokenStr;
+                        dto.RealName = user.RealName;
+
+                        return dto;
                     }
                     else //褰撳墠璐﹀彿琚鐢�
                     {
@@ -77,7 +83,7 @@
                         throw Oops.Bah("褰撳墠璐﹀彿宸茶绂佺敤");
                     }
                 }
-                else if (userId == -1) //璐﹀彿瀵嗙爜閿欒
+                else if (user.Id == -1) //璐﹀彿瀵嗙爜閿欒
                 {
                     throw Oops.Bah("褰撳墠璐﹀彿鎴栧瘑鐮侀敊璇�");
                 }

--
Gitblit v1.8.0