From 461ccbda1d9d3fef42f250771c2fd30702755c16 Mon Sep 17 00:00:00 2001 From: yanjinhui <3306209981@qq.com> Date: 星期四, 24 四月 2025 17:18:35 +0800 Subject: [PATCH] PLC --- 项目代码/WIDESEAWCS_Server 正式/WIDESEAWCS_SystemServices/Sys_UserService.cs | 434 ++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 342 insertions(+), 92 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 88ddcee..97a36ef 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" @@ -20,6 +20,10 @@ using WIDESEAWCS_DTO.Telescopic; using WIDESEAWCS_Common; using Newtonsoft.Json; +using OfficeOpenXml.FormulaParsing.Excel.Functions.Math; +using System.Security.Policy; +using System.Runtime.InteropServices; +using System; namespace WIDESEAWCS_SystemServices { @@ -49,14 +53,18 @@ } + #region 浜鸿劯璇嗗埆鐧诲叆鎺ュ彛 + /// <summary> + /// 浜鸿劯璇嗗埆鐧诲叆鎺ュ彛 + /// </summary> + /// <param name="loginInfo"></param> + /// <returns></returns> public WebResponseContent Login(LoginInfo loginInfo) { WebResponseContent content = new WebResponseContent(); try { - // BaseDal.QueryFirst(x => x.UserName == loginInfo.UserName); - - string msg = string.Empty; + //string msg = string.Empty; #region 涓存椂浣跨敤 try @@ -65,74 +73,110 @@ } catch { - } #endregion + + // 鍏堣幏鍙栫敤鎴蜂俊鎭� + UserInfo user = null; if (!string.IsNullOrEmpty(loginInfo.path)) { - var faceResult = BaiDuFaceHelper.FaceSearch(loginInfo.path); - - if (faceResult != null && faceResult.error_code == 0) + // 浜鸿劯璇嗗埆鐧诲綍 + var groupId = _faceRecognitionRepository.QueryData().Select(x => x.GroupID).FirstOrDefault(); + if (groupId == null) { - // 鑾峰彇鏈�楂樺尮閰嶅害鐨勭敤鎴� - 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 { Data = true }; - } + return WebResponseContent.Instance.Error("娌℃壘鍒拌浜鸿劯璇嗗埆鍒嗙粍"); } - return WebResponseContent.Instance.Error("浜鸿劯璇嗗埆澶辫触锛岃閲嶈瘯"); + var faceResult = BaiDuFaceHelper.FaceSearch(loginInfo.path, groupId); + if (faceResult != null && faceResult.error_code == 0) + { + var bestMatch = faceResult.result.user_list.OrderByDescending(u => u.score).FirstOrDefault(); + string usercount = bestMatch.user_id; + if (bestMatch != null && double.TryParse(bestMatch.score, out double score) && score > 80) + { + //鐢ㄨ瘑鍒埌鐨� user_id 鏉ヨ幏鍙栫敤鎴蜂俊鎭� + var faceuser = BaseDal.QueryData(x => x.UserName == usercount).FirstOrDefault(); // 鑾峰彇鍖归厤鐨勭涓�涓敤鎴� + if (faceuser != null) + { + // 鎵嬪姩灏� Sys_User 鏄犲皠鍒� UserInfo + user = new UserInfo + { + UserId = faceuser.User_Id, + UserName = faceuser.UserName, + UserTrueName = faceuser.UserTrueName, + HeadImageUrl = faceuser.HeadImageUrl, + RoleId = faceuser.Role_Id, + TenantId = faceuser.TenantId, + }; + } + } + + if (user == null) + { + return WebResponseContent.Instance.Error("浜鸿劯璇嗗埆澶辫触锛岃閲嶈瘯"); + } + loginInfo.UserName = user.UserName; + } } else { - UserInfo user = BaseDal.GetUserInfo(loginInfo.UserName, loginInfo.Password); - var disbled = BaseDal.QueryFirst(x => x.UserName == loginInfo.UserName);//鏍规嵁杩欎釜鐢ㄦ埛鍚嶆潵鏌ョ湅鐢ㄦ埛 - if (user != null) + // 瀵嗙爜鐧诲綍 + user = BaseDal.GetUserInfo(loginInfo.UserName, loginInfo.Password); + } + + // 濡傛灉鎵惧埌鐢ㄦ埛 + if (user != null) + { + + var disbled = BaseDal.QueryFirst(x => x.UserName == loginInfo.UserName); + if (disbled.Enable != 1) { - 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 }); + 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) { content = WebResponseContent.Instance.Error(ex.Message); @@ -140,6 +184,9 @@ return content; } + #endregion + + public override WebResponseContent UpdateData(SaveModel saveModel) { @@ -273,7 +320,12 @@ } } - + /// <summary> + /// 鏍规嵁鐢ㄦ埛缁勬潵鏌ョ湅褰撳墠浣滀笟鐨勬潈闄� + /// </summary> + /// <param name="userId">鐢ㄦ埛id</param> + /// <param name="group">鐢ㄦ埛鍒嗙粍</param> + /// <returns></returns> public WebResponseContent PermissionView(int userId, string group) { try @@ -463,7 +515,7 @@ return new WebResponseContent { Status = false, Message = "鏁版嵁涓虹┖" }; } - var query = sys.LeftJoin<Dt_FaceRecognition>((a, b) => a.Log_id == b.ID); + var query = sys.LeftJoin<Dt_FaceRecognition>((a, b) => a.Log_id == b.GroupID); if (!string.IsNullOrEmpty(paginationDTO.searchKeyword)) { query = query.Where((a, b) => @@ -481,9 +533,13 @@ var result = query.Select((a, b) => new { + + + a.Log_id, a.User_Id, a.UserName, a.UserTrueName, + a.UserPwd, a.PhoneNo, a.Role_Id, a.RoleName, @@ -514,17 +570,32 @@ } } - + /// <summary> + /// 娣诲姞鐢ㄦ埛 + /// </summary> + /// <param name="addUserDTO"></param> + /// <returns></returns> public WebResponseContent AdduserData(AddUserDTO addUserDTO) { try { + if (addUserDTO == null) + { + return new WebResponseContent { Status = false, Message = "璇锋眰鏁版嵁涓虹┖锛屽彲鑳芥槸 JSON 瑙f瀽澶辫触" }; + } + var list = BaseDal.QueryData(a => a.UserName == addUserDTO.username).FirstOrDefault(); + if (list != null) + { + return new WebResponseContent { Status = false, Message = "璐﹀彿閲嶅锛岃閲嶆柊褰曞叆" }; + } + var face = _faceRecognitionRepository.QueryData().Select(x => x.GroupID).FirstOrDefault(); ; var baiduResult = BaiDuFaceHelper.AddUser(new BDUserInfo { ImgPath = addUserDTO.path, user_id = addUserDTO.username, - group_id = addUserDTO.log_id // 杩欓噷搴旇濉櫨搴︿汉鑴稿簱鍒嗙粍 + group_id = face // 杩欓噷搴旇濉櫨搴︿汉鑴稿簱鍒嗙粍 + // group_id = baiduResult.result.log_id }); @@ -532,20 +603,24 @@ if (baiduResult == null || baiduResult.error_code != 0) { return new WebResponseContent { Status = false, Data = "浜鸿劯娉ㄥ唽澶辫触锛�" + baiduResult.error_msg }; + + } // 鍒涘缓鐢ㄦ埛鏁版嵁 var sys = new Sys_User { UserName = addUserDTO.username, + UserTrueName=addUserDTO.usertruename, HeadImageUrl=addUserDTO.path, - Log_id = addUserDTO.log_id, + Log_id = baiduResult.log_id, Face_token = baiduResult.result.face_token, PhoneNo = addUserDTO.phoneno, Role_Id = addUserDTO.roleid, RoleName = addUserDTO.rolename, Enable = addUserDTO.enable, - UserPwd= "j79rYYvCz4vdhcboB1Ausg==" + UserPwd= "j79rYYvCz4vdhcboB1Ausg==", + CreateDate=DateTime.Now }; BaseDal.AddData(sys); return new WebResponseContent { Status = true, Data = sys }; @@ -558,67 +633,107 @@ } + + /// <summary> + ///鐧惧害浜� 鏇存柊鐢ㄦ埛 + /// </summary> + /// <param name="addUserDTO"></param> + /// <returns></returns> public WebResponseContent UpuserData(AddUserDTO addUserDTO) { try { - - var baiduResult = BaiDuFaceHelper.AddUser(new BDUserInfo + // 1. 鏌ヨ鐢ㄦ埛 + var userList = BaseDal.QueryData(); + var sys = userList.FirstOrDefault(x => x.User_Id == addUserDTO.id); + if (sys == null) { - ImgPath = addUserDTO.path, - user_id = addUserDTO.username, - group_id = addUserDTO.log_id // 杩欓噷搴旇濉櫨搴︿汉鑴稿簱鍒嗙粍 - }); - - - // 鍒ゆ柇鐧惧害杩斿洖鏄惁鎴愬姛 - if (baiduResult == null || baiduResult.error_code != 0) - { - return new WebResponseContent { Status = false, Data = "浜鸿劯鏇存柊澶辫触锛�" + baiduResult.error_msg }; + return new WebResponseContent { Status = false, Message = "娌℃壘鍒拌鐢ㄦ埛" }; } - // 鏇存柊鐢ㄦ埛鏁版嵁 - var sys = new Sys_User + // 2. 妫�鏌ヨ处鍙锋槸鍚︿慨鏀癸紝骞跺垽鏂槸鍚﹂噸澶�//StringComparison.OrdinalIgnoreCase锛氳〃绀哄拷鐣ュぇ灏忓啓杩涜姣旇緝锛屾瘮濡� "admin" 鍜� "ADMIN" 涔熻涓烘槸鐩哥瓑鐨� + if (!string.Equals(sys.UserName, addUserDTO.username)) { - UserName = addUserDTO.username, - HeadImageUrl = addUserDTO.path, - Log_id = addUserDTO.log_id, - Face_token = baiduResult.result.face_token, - PhoneNo = addUserDTO.phoneno, - Role_Id = addUserDTO.roleid, - RoleName = addUserDTO.rolename, - Enable = addUserDTO.enable, - }; + var existUser = userList.FirstOrDefault(a => a.UserName == addUserDTO.username); + if (existUser != null) + { + return new WebResponseContent { Status = false, Message = "璐﹀彿閲嶅锛岃閲嶆柊褰曞叆" }; + } + sys.UserName = addUserDTO.username; // 纭鍙互鏀规椂鎵嶄慨鏀� + } + + // 3. 鏇存柊鍏朵粬鐢ㄦ埛淇℃伅 + sys.UserTrueName = addUserDTO.usertruename; + sys.PhoneNo = addUserDTO.phoneno; + sys.Role_Id = addUserDTO.roleid; + sys.RoleName = addUserDTO.rolename; + sys.Enable = addUserDTO.enable; + + // 4. 鏌ヨ浜鸿劯搴撳垎缁� ID + var faceGroupID = _faceRecognitionRepository.QueryData().Select(x => x.GroupID).FirstOrDefault(); + + // 5. 鍒ゆ柇鏄惁闇�瑕佹洿鏂颁汉鑴镐俊鎭疎quals 鏄� .NET 涓敤浜庢瘮杈冧袱涓璞℃槸鍚︾浉绛� + if (!string.Equals(sys.HeadImageUrl, addUserDTO.path)) // 鏈夋柊鍥剧墖鎵嶅鐞嗕汉鑴告敞鍐�=> 鍓嶉潰鐨勫啓娉曠瓑浜�=if (sys.HeadImageUrl!=addUserDTO.path) + { + var baiduResult = BaiDuFaceHelper.AddUser(new BDUserInfo + { + ImgPath = addUserDTO.path, + user_id = sys.UserName, + group_id = faceGroupID + }); + + // 6. 鍒ゆ柇鐧惧害 API 鏄惁鎴愬姛 + if (baiduResult == null || baiduResult.error_code != 0) + { + return new WebResponseContent { Status = false, Message = "浜鸿劯鏇存柊澶辫触锛�" + baiduResult.error_msg }; + } + + // 7. 鏇存柊浜鸿劯鐩稿叧瀛楁 + sys.Log_id = baiduResult.log_id; + sys.HeadImageUrl = addUserDTO.path; + sys.Face_token = baiduResult.result.face_token; + } + + // 8. 鏇存柊鏁版嵁搴� BaseDal.UpdateData(sys); return new WebResponseContent { Status = true, Data = sys }; } catch (Exception ex) { - - return new WebResponseContent { Status = false, Message = "澶辫触" + ex }; + return new WebResponseContent { Status = false, Message = "澶辫触锛�" + ex.Message }; } - } + + + + /// <summary> /// 鍒犻櫎 /// </summary> /// <param name="deleteUserDTO"></param> /// <returns></returns> - public WebResponseContent DeleteUserData(DeleteUserImg deleteUserDTO) + public WebResponseContent DeleteUserData(string account) { try { - - string apiResult = BaiDuFaceHelper.DeleteUser(deleteUserDTO); + + // 2. 鏌ヨ浜鸿劯搴撳垎缁� ID + var faceGroupID = _faceRecognitionRepository.QueryData().Select(x => x.GroupID).FirstOrDefault(); + + WIDESEAWCS_Common.DeleteUserImg deleteUserImg = new WIDESEAWCS_Common.DeleteUserImg(); + deleteUserImg.group_id = faceGroupID; + deleteUserImg.user_id = account; + + string apiResult = BaiDuFaceHelper.DeleteUser(deleteUserImg);//鍙缁欑敤鎴疯处鍙峰拰鐢ㄦ埛缁刬d // 2. 瑙f瀽杩斿洖缁撴灉锛屽垽鏂垹闄ゆ槸鍚︽垚鍔� dynamic resultObj = JsonConvert.DeserializeObject(apiResult); if (resultObj.error_code == 0) { // 鐧惧害鍒犻櫎鎴愬姛鍚庯紝鍒犻櫎鏁版嵁搴撲腑鐨勭敤鎴� - var user = BaseDal.QueryData(deleteUserDTO.user_id); + var user = BaseDal.QueryData(x=>x.UserName== account); if (user != null) { BaseDal.DeleteData(user); @@ -637,7 +752,142 @@ } - + public WebResponseContent SaveFaceFiles(IFormCollection files) + { + if (files == null || files.Files.Count == 0) + return new WebResponseContent { Status = false, Message = "璇蜂笂浼犳枃浠�" }; + + // 1. 纭繚瀛樺偍鐩綍瀛樺湪 + string baseDirectory = Path.Combine(Directory.GetCurrentDirectory(), "wwwroot", "UploadfaceImage"); + if (!Directory.Exists(baseDirectory)) + Directory.CreateDirectory(baseDirectory); + + try + { + var file = files.Files[0]; // 鍙鐞嗙涓�涓枃浠� + string fileName = file.FileName; // 鐩存帴浣跨敤鍓嶇鐨勬枃浠跺悕 + + string fullFilePath = Path.Combine(baseDirectory, fileName); + + // 2. 淇濆瓨鏂囦欢锛堝鏋滃瓨鍦紝鍒欒鐩栵級 + using (var stream = new FileStream(fullFilePath, FileMode.Create)) + { + file.CopyTo(stream); + } + + // 3. 杩斿洖鏂囦欢鍚� + return new WebResponseContent { Status = true, Message = "鏂囦欢涓婁紶鎴愬姛", Data = fileName }; + } + catch (Exception ex) + { + return new WebResponseContent { Status = false, Message = "涓婁紶鏂囦欢澶辫触锛�" + ex.Message }; + } + } + + + /// <summary> + /// 鍒犻櫎鏁版嵁搴撲腑娌℃湁浣跨敤鐨勫浘鐗� + /// </summary> + /// <returns></returns> + /// <exception cref="NotImplementedException"></exception> + public WebResponseContent CleanUnusedImages() + { + try + { + // 鑾峰彇鏂囦欢鐨勫畬鏁磋矾寰� + string pathimage = Path.Combine(Directory.GetCurrentDirectory(), "wwwroot", "image"); + + // 濡傛灉鏂囦欢澶逛笉瀛樺湪锛岃繑鍥為敊璇俊鎭� + if (!Directory.Exists(pathimage)) + { + return new WebResponseContent { Status = false, Message = "鍥剧墖鏂囦欢澶逛笉瀛樺湪" }; + } + + // **浣跨敤 HashSet 鎻愰珮鏌ユ壘鏁堢巼** + var userImageSet = BaseDal.QueryData(x => !string.IsNullOrEmpty(x.HeadImageUrl)) + .Select(x => x.HeadImageUrl) + .ToHashSet(); // **鎻愬崌鏌ヨ閫熷害** + + // 鑾峰彇鏂囦欢澶逛腑鐨勬墍鏈夊浘鐗囨枃浠讹紙鏂囦欢鍚嶏級 + var imageFiles = Directory.GetFiles(pathimage) + .Select(Path.GetFileName) + .ToList(); + + int deletedCount = 0; + foreach (var file in imageFiles) + { + // **HashSet 鏌ヨ O(1)** + if (!userImageSet.Contains(file)) + { + string filePath = Path.Combine(pathimage, file); + try + { + File.Delete(filePath); + deletedCount++; + } + catch (Exception ex) + { + Console.WriteLine($"鏃犳硶鍒犻櫎鏂囦欢 {file}: {ex.Message}"); + } + } + } + + return new WebResponseContent { Status = true, Message = $"娓呯悊瀹屾垚锛屽垹闄や簡 {deletedCount} 寮犳湭浣跨敤鐨勫浘鐗�" }; + } + catch (Exception ex) + { + return new WebResponseContent { Status = false, Message = $"娓呯悊澶辫触: {ex.Message}" }; + } + } + + /// <summary> + /// 浜鸿劯鍒犻櫎锛堝垹闄ょ敤鎴风殑鏌愪竴寮犱汉鑴革紝濡傛灉璇ョ敤鎴峰彧鏈変竴寮犱汉鑴稿浘鐗囷紝鍒欏悓鏃跺垹闄ょ敤鎴枫�傦級 + /// </summary> + /// <param name="addUserDTO"></param> + /// <returns></returns> + /// <exception cref="NotImplementedException"></exception> + public WebResponseContent DeleteUserIsface(string account) + { + try + { + + // 1. 鏌ヨ浜鸿劯搴撳垎缁� ID + var faceGroupID = _faceRecognitionRepository.QueryData().Select(x => x.GroupID).FirstOrDefault(); + //2.鏌ヨ瑕佸垹閭d釜鐢ㄦ埛鐨� + var user = BaseDal.QueryData(x => x.UserName == account).FirstOrDefault(); + if (user == null) + { + return new WebResponseContent { Status = false, Message = "鐢ㄦ埛涓嶅瓨鍦紝璇锋鏌ヨ处鍙锋槸鍚﹁緭鍏ユ纭�" }; + } + + WIDESEAWCS_Common.DeleteUserImg deleteUserImg = new WIDESEAWCS_Common.DeleteUserImg(); + deleteUserImg.group_id = faceGroupID; + deleteUserImg.user_id = account; + deleteUserImg.face_token = user.Face_token; + deleteUserImg.log_id=user.Log_id; + + string apiResult = BaiDuFaceHelper.DeleteUserImg(deleteUserImg);//缁欑敤鎴疯处鍙�/鐢ㄦ埛缁刬d/Face_token/Log_id + + // 2. 瑙f瀽杩斿洖缁撴灉锛屽垽鏂垹闄ゆ槸鍚︽垚鍔� + dynamic resultObj = JsonConvert.DeserializeObject(apiResult); + if (resultObj.error_code == 0) + { + if (user != null) + { + BaseDal.DeleteData(user); + } + return WebResponseContent.Instance.OK("鍒犻櫎鎴愬姛"); + } + else + { + return WebResponseContent.Instance.Error("鐧惧害 API 鍒犻櫎澶辫触锛�" + resultObj.error_msg); + } + } + catch (Exception ex) + { + return WebResponseContent.Instance.Error("鍒犻櫎鐢ㄦ埛澶辫触锛�" + ex.Message); + } + } } } -- Gitblit v1.9.3