PLC

yanjinhui

2025-04-24 461ccbda1d9d3fef42f250771c2fd30702755c16

 ÏîÄ¿´úÂë/WIDESEAWCS_Server Õýʽ/WIDESEAWCS_SystemServices/Sys_UserService.cs

@@ -22,6 +22,8 @@
using Newtonsoft.Json;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
using System.Security.Policy;
using System.Runtime.InteropServices;
using System;

namespace WIDESEAWCS_SystemServices
{
@@ -51,110 +53,7 @@

        }

        //#region åŽŸæœ¬ç™»å…¥
        //public WebResponseContent Login(LoginInfo loginInfo)
        //{
        //    WebResponseContent content = new WebResponseContent();
        //    try
        //    {
        //        // BaseDal.QueryFirst(x => x.UserName == loginInfo.UserName);

        //        string msg = string.Empty;

        //        #region ä¸´æ—¶ä½¿ç”¨
        //        try
        //        {
        //            loginInfo.Password = loginInfo.Password.EncryptDES(AppSecret.User);
        //        }
        //        catch
        //        {

        //        }
        //        #endregion
        //        if (!string.IsNullOrEmpty(loginInfo.path))
        //        {
        //            var gruoid = _faceRecognitionRepository.QueryData().Select(x => x.GroupID).FirstOrDefault();
        //            if (gruoid == null)
        //            {
        //                return new WebResponseContent { Status = false, Message = "没找到该组" };

        //            }
        //            var faceResult = BaiDuFaceHelper.FaceSearch(loginInfo.path, gruoid);

        //            if (faceResult != null && faceResult.error_code == 0)
        //            {
        //                // èŽ·å–最高匹配度的用户
        //                var bestMatch = faceResult.result.user_list.OrderByDescending(u => u.score).FirstOrDefault();//拿第一个最高的

        //                if (bestMatch != null && double.TryParse(bestMatch.score, out double score) && score > 80) // è®¾å®š80分为可信度阈值
        //                {
        //                    //return new WebResponseContent {Status=true,Data = true,Message="识别登入成功" };

        //                }
        //            }

        //            return WebResponseContent.Instance.Error("人脸识别失败，请重试");
        //        }

        //        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);
        //            if (obj is not IEnumerable<object> list)
        //            {
        //                return WebResponseContent.Instance.Error("无登录权限");
        //            }
        //            if (!list.Any())
        //            {
        //                return WebResponseContent.Instance.Error("无登录权限");
        //            }
        //            if (disbled.Enable != 1)
        //            {
        //                return WebResponseContent.Instance.Error("你的账号已被禁用，请联系管理员");
        //            }

        //            string token = JwtHelper.IssueJwt(new TokenModelJwt()
        //            {
        //                UserId = user.UserId,
        //                RoleId = user.RoleId,
        //                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, ID = user.UserId, RoleId = user.RoleId });
        //        }
        //        else
        //        {
        //            content = WebResponseContent.Instance.Error("账号或密码错误");
        //        }

        //    }

        //    catch (Exception ex)
        //    {
        //        content = WebResponseContent.Instance.Error(ex.Message);
        //    }

        //    return content;
        //}
        //#endregion


        #region  äººè„¸è¯†åˆ«ç™»å…¥æŽ¥å£
        /// <summary>
        /// äººè„¸è¯†åˆ«ç™»å…¥æŽ¥å£
        /// </summary>
@@ -225,58 +124,58 @@
                    user = BaseDal.GetUserInfo(loginInfo.UserName, loginInfo.Password);
                }

                    // å¦‚果找到用户
                    if (user != null)
                // å¦‚果找到用户
                if (user != null)
                {

                    var disbled = BaseDal.QueryFirst(x => x.UserName == loginInfo.UserName);
                    if (disbled.Enable != 1)
                    {
                   
                        var disbled = BaseDal.QueryFirst(x => x.UserName == loginInfo.UserName);
                        if (disbled.Enable != 1)
                        {
                            return WebResponseContent.Instance.Error("你的账号已被禁用，请联系管理员");
                        }

                        // èŽ·å–角色权限
                        object obj = _menuService.GetMenuActionList(user.RoleId);
                        if (obj is not IEnumerable<object> list || !list.Any())
                        {
                            return WebResponseContent.Instance.Error("无登录权限");
                        }

                        // ç”Ÿæˆ JWT Token
                        string token = JwtHelper.IssueJwt(new TokenModelJwt()
                        {
                            UserId = user.UserId,
                            RoleId = user.RoleId,
                            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,
                            ID = user.UserId,
                            RoleId = user.RoleId
                        });
                        return WebResponseContent.Instance.Error("你的账号已被禁用，请联系管理员");
                    }
                    else

                    // èŽ·å–角色权限
                    object obj = _menuService.GetMenuActionList(user.RoleId);
                    if (obj is not IEnumerable<object> list || !list.Any())
                    {
                        content = WebResponseContent.Instance.Error("账号或密码错误");
                        return WebResponseContent.Instance.Error("无登录权限");
                    }

                    // ç”Ÿæˆ JWT Token
                    string token = JwtHelper.IssueJwt(new TokenModelJwt()
                    {
                        UserId = user.UserId,
                        RoleId = user.RoleId,
                        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,
                        ID = user.UserId,
                        RoleId = user.RoleId
                    });
                }
                else
                {
                    content = WebResponseContent.Instance.Error("账号或密码错误");
                }
            }
            catch (Exception ex)
            {
@@ -285,8 +184,8 @@

            return content;
        }
        #endregion

       


        public override WebResponseContent UpdateData(SaveModel saveModel)