From 8f143507d4f1e38a5cc63348ea23a1aeb9182006 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期二, 01 四月 2025 17:02:51 +0800
Subject: [PATCH] Merge branch 'qy0227' of http://115.159.85.185:8098/r/MeiXinLaiRui/NiuJuKongZhi into qy0227
---
项目代码/WIDESEAWCS_Server 正式/WIDESEAWCS_SystemServices/Sys_UserService.cs | 305 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 264 insertions(+), 41 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 55c3023..88ddcee 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"
@@ -17,6 +17,9 @@
using ICacheService = WIDESEAWCS_Core.Caches.ICacheService;
using Microsoft.AspNetCore.Builder;
using WIDESEAWCS_DTO.SerialPort;
+using WIDESEAWCS_DTO.Telescopic;
+using WIDESEAWCS_Common;
+using Newtonsoft.Json;
namespace WIDESEAWCS_SystemServices
{
@@ -28,8 +31,11 @@
private readonly ISys_RoleRepository _RoleRepository;
private readonly ILoginHistoryRepository _loginHistoryRepository;
private readonly IPutakeRepository _putakeRepository;
+ private readonly IFaceRecognitionRepository _faceRecognitionRepository;
- public Sys_UserService(ISys_UserRepository repository, IUnitOfWorkManage unitOfWorkManage,
+
+
+ public Sys_UserService(IFaceRecognitionRepository faceRecognitionRepository, ISys_UserRepository repository, IUnitOfWorkManage unitOfWorkManage,
ICacheService cacheService, ISys_MenuService menuService, ISys_RoleRepository roleRepository, ILoginHistoryRepository loginHistoryRepository, IPutakeRepository putakeRepository) : base(repository)
{
_unitOfWorkManage = unitOfWorkManage;
@@ -39,6 +45,8 @@
_RoleRepository = roleRepository;
_loginHistoryRepository = loginHistoryRepository;
_putakeRepository = putakeRepository;
+ _faceRecognitionRepository = faceRecognitionRepository;
+
}
public WebResponseContent Login(LoginInfo loginInfo)
@@ -46,7 +54,7 @@
WebResponseContent content = new WebResponseContent();
try
{
- //BaseDal.QueryFirst(x => x.UserName == loginInfo.UserName);
+ // BaseDal.QueryFirst(x => x.UserName == loginInfo.UserName);
string msg = string.Empty;
@@ -60,51 +68,71 @@
}
#endregion
-
- UserInfo user = BaseDal.GetUserInfo(loginInfo.UserName, loginInfo.Password);
- var disbled = BaseDal.QueryFirst(x => x.UserName == loginInfo.UserName);//鏍规嵁杩欎釜鐢ㄦ埛鍚嶆潵鏌ョ湅鐢ㄦ埛
- if (user != null)
+ if (!string.IsNullOrEmpty(loginInfo.path))
{
- object obj = _menuService.GetMenuActionList(user.RoleId);
- if (obj is not IEnumerable<object> list)
+ var faceResult = BaiDuFaceHelper.FaceSearch(loginInfo.path);
+
+ if (faceResult != null && faceResult.error_code == 0)
{
- return WebResponseContent.Instance.Error("鏃犵櫥褰曟潈闄�");
- }
- if (!list.Any())
- {
- return WebResponseContent.Instance.Error("鏃犵櫥褰曟潈闄�");
- }
- if (disbled.Enable != 1)
- {
- return WebResponseContent.Instance.Error("浣犵殑璐﹀彿宸茶绂佺敤锛岃鑱旂郴绠＄悊鍛�");
+ // 鑾峰彇鏈�楂樺尮閰嶅害鐨勭敤鎴�
+ 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 };
+ }
}
- 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
{
- content = 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);
@@ -355,7 +383,7 @@
if (newPwd.Length < 6) return content.Error("瀵嗙爜涓嶈兘灏戜簬6浣�");
// 鑾峰彇鐢ㄦ埛褰撳墠瀵嗙爜
- string userCurrentPwd = BaseDal.QueryFirst(x => x.User_Id == id, s => s.UserPwd) ?? "";
+ string userCurrentPwd = BaseDal.QueryFirst(x => x.User_Id == id, s => s.UserPwd) ?? "";
if (string.IsNullOrEmpty(userCurrentPwd)) return content.Error("鐢ㄦ埛涓嶅瓨鍦ㄦ垨瀵嗙爜鏈缃�");
@@ -398,7 +426,7 @@
try
{
var user = BaseDal.QueryData(x => x.User_Id == userDTO.id).FirstOrDefault();
- if (user==null)
+ if (user == null)
{
return new WebResponseContent { Status = false, Message = "娌℃壘鍒拌鐢ㄦ埛" };
}
@@ -411,10 +439,205 @@
catch (Exception ex)
{
- return new WebResponseContent { Status = false ,Message="澶辫触锛�"+ex};
+ return new WebResponseContent { Status = false, Message = "澶辫触锛�" + ex };
}
}
+
+
+ /// <summary>
+ /// 鏌ョ湅鐢ㄦ埛淇℃伅鍜屼汉鑴歌瘑鍒〃
+ /// </summary>
+ /// <param name="paginationDTO"></param>
+ /// <returns></returns>
+ public WebResponseContent GetUserFace(PaginationDTO paginationDTO)
+ {
+ try
+ {
+ int totalCount = 0;
+ var sys = Db.Queryable<Sys_User>();
+ var face = _faceRecognitionRepository.Db.Queryable<Dt_FaceRecognition>();
+
+ if (face == null)
+ {
+ return new WebResponseContent { Status = false, Message = "鏁版嵁涓虹┖" };
+ }
+
+ var query = sys.LeftJoin<Dt_FaceRecognition>((a, b) => a.Log_id == b.ID);
+ if (!string.IsNullOrEmpty(paginationDTO.searchKeyword))
+ {
+ query = query.Where((a, b) =>
+ a.UserName.Contains(paginationDTO.searchKeyword) ||
+ a.UserTrueName.Contains(paginationDTO.searchKeyword) ||
+ a.PhoneNo.Contains(paginationDTO.searchKeyword) ||
+ a.RoleName.Contains(paginationDTO.searchKeyword) ||
+ a.Role_Id.ToString().Contains(paginationDTO.searchKeyword)
+ );
+ }
+ if (paginationDTO.startDate.HasValue && paginationDTO.endDate.HasValue)
+ {
+ query = query.Where((a, b) => a.CreateDate >= paginationDTO.startDate && a.CreateDate <= paginationDTO.endDate);
+ }
+
+ var result = query.Select((a, b) => new
+ {
+ a.User_Id,
+ a.UserName,
+ a.UserTrueName,
+ a.PhoneNo,
+ a.Role_Id,
+ a.RoleName,
+ a.HeadImageUrl,
+ a.Enable,
+ a.CreateDate,
+ a.Face_token,
+ b.GroupID,
+ }).ToPageList(paginationDTO.pageIndex, paginationDTO.pageSize, ref totalCount);
+ return new WebResponseContent
+ {
+ Status = true,
+ Data = new
+ {
+ TotalCount = totalCount,//鎬绘暟
+ PageIndex = paginationDTO.pageIndex,//椤垫暟
+ PaseSize = paginationDTO.pageSize,//涓�椤靛灏戞暟鎹�
+ Items = result//杩斿洖瀛楁
+ }
+
+ };
+
+ }
+ catch (Exception)
+ {
+
+ throw;
+ }
+ }
+
+
+ public WebResponseContent AdduserData(AddUserDTO addUserDTO)
+ {
+ try
+ {
+
+ var baiduResult = BaiDuFaceHelper.AddUser(new BDUserInfo
+ {
+ 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 };
+ }
+
+ // 鍒涘缓鐢ㄦ埛鏁版嵁
+ var sys = new Sys_User
+ {
+ 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,
+ UserPwd= "j79rYYvCz4vdhcboB1Ausg=="
+ };
+ BaseDal.AddData(sys);
+ return new WebResponseContent { Status = true, Data = sys };
+ }
+ catch (Exception ex)
+ {
+
+ return new WebResponseContent { Status = false, Message = "澶辫触" + ex };
+ }
+
+ }
+
+ public WebResponseContent UpuserData(AddUserDTO addUserDTO)
+ {
+ try
+ {
+
+ var baiduResult = BaiDuFaceHelper.AddUser(new BDUserInfo
+ {
+ 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 };
+ }
+
+ // 鏇存柊鐢ㄦ埛鏁版嵁
+ var sys = new Sys_User
+ {
+ 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,
+ };
+ BaseDal.UpdateData(sys);
+
+ return new WebResponseContent { Status = true, Data = sys };
+ }
+ catch (Exception ex)
+ {
+
+ return new WebResponseContent { Status = false, Message = "澶辫触" + ex };
+ }
+
+ }
+
+ /// <summary>
+ /// 鍒犻櫎
+ /// </summary>
+ /// <param name="deleteUserDTO"></param>
+ /// <returns></returns>
+ public WebResponseContent DeleteUserData(DeleteUserImg deleteUserDTO)
+ {
+ try
+ {
+
+ string apiResult = BaiDuFaceHelper.DeleteUser(deleteUserDTO);
+
+ // 2. 瑙ｆ瀽杩斿洖缁撴灉锛屽垽鏂垹闄ゆ槸鍚︽垚鍔�
+ dynamic resultObj = JsonConvert.DeserializeObject(apiResult);
+ if (resultObj.error_code == 0)
+ {
+ // 鐧惧害鍒犻櫎鎴愬姛鍚庯紝鍒犻櫎鏁版嵁搴撲腑鐨勭敤鎴�
+ var user = BaseDal.QueryData(deleteUserDTO.user_id);
+ 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