From 16faf0baa94bc0e5028233abb23ce5681a50b9dd Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期四, 03 四月 2025 15:05:03 +0800
Subject: [PATCH] 完成人脸识别功能
---
项目代码/WIDESEAWCS_Server 正式/WIDESEAWCS_Server/Controllers/System/Sys_UserController.cs | 26 +++
/dev/null | 0
项目代码/WIDESEAWCS_Server 正式/WIDESEAWCS_Common/BaiDuFaceHelper.cs | 7
项目代码/WIDESEAWCS_Server 正式/WIDESEAWCS_ISystemServices/ISys_UserService.cs | 12 +
项目代码/WIDESEAWCS_Server 正式/WIDESEAWCS_Model/LoginInfo.cs | 6
项目代码/WIDESEAWCS_Server 正式/WIDESEAWCS_DTO/SerialPort/UserDTO.cs | 2
项目代码/WIDESEAWCS_Server 正式/WIDESEAWCS_SystemServices/Sys_UserService.cs | 360 +++++++++++++++++++++++++++++++++++++++++++--------
7 files changed, 349 insertions(+), 64 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_Common/BaiDuFaceHelper.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Common/BaiDuFaceHelper.cs"
index 3063316..5f19dce 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Common/BaiDuFaceHelper.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Common/BaiDuFaceHelper.cs"
@@ -229,17 +229,17 @@
/// 浜鸿劯鎼滅储
/// </summary>
/// <returns></returns>
- public static SearchResult FaceSearch(string path)
+ public static SearchResult FaceSearch(string path,string group_id_list)
{
string token = GetAccessToken();
var imgbase64 = GetFileContentAsBase64(path);
- string host = "https://aip.baidubce.com/rest/2.0/face/v3/faceset/face/delete?access_token=" + token;
+ string host = "https://aip.baidubce.com/rest/2.0/face/v3/search?access_token=" + token;
Encoding encoding = Encoding.Default;
HttpWebRequest request = (HttpWebRequest)WebRequest.Create(host);
request.Method = "POST";
request.KeepAlive = true;
- String str = "{\"image\":\"" + imgbase64 + "\",\"image_type\":\"BASE64\",\"group_id_list\":\"1\",\"quality_control\":\"LOW\",\"liveness_control\":\"NORMAL\"}";
+ String str = "{\"image\":\"" + imgbase64 + "\",\"image_type\":\"BASE64\",\"group_id_list\":\""+ group_id_list + "\",\"quality_control\":\"LOW\",\"liveness_control\":\"NORMAL\"}";
byte[] buffer = encoding.GetBytes(str);
request.ContentLength = buffer.Length;
request.GetRequestStream().Write(buffer, 0, buffer.Length);
@@ -355,6 +355,7 @@
/// <summary>
/// 鐢ㄦ埛id锛堢敱鏁板瓧銆佸瓧姣嶃�佷笅鍒掔嚎缁勬垚锛夛紝闀垮害闄愬埗48B
/// </summary>
+ //public string user_id { get; set;}
public string user_id { get; set;}
/// <summary>
/// 鐢ㄦ埛缁刬d锛堢敱鏁板瓧銆佸瓧姣嶃�佷笅鍒掔嚎缁勬垚锛� 闀垮害闄愬埗48B锛屽垹闄ゆ寚瀹歡roup_id涓殑user_id淇℃伅
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_DTO/SerialPort/UserDTO.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_DTO/SerialPort/UserDTO.cs"
index da59c10..8686abd 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_DTO/SerialPort/UserDTO.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_DTO/SerialPort/UserDTO.cs"
@@ -37,4 +37,6 @@
}
+
+
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_ISystemServices/ISys_UserService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_ISystemServices/ISys_UserService.cs"
index 97f3644..e3ddea9 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_ISystemServices/ISys_UserService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_ISystemServices/ISys_UserService.cs"
@@ -80,8 +80,16 @@
WebResponseContent UpuserData(AddUserDTO addUserDTO);
- WebResponseContent DeleteUserData(DeleteUserImg deleteUserDTO);
+ WebResponseContent DeleteUserData(string userAccount);
-
+ /// <summary>
+ /// 娓呯悊鏁版嵁搴撲腑娌℃湁浣跨敤鐨勫浘鐗�
+ /// </summary>
+ /// <returns></returns>
+ WebResponseContent CleanUnusedImages();
+
+ WebResponseContent SaveFaceFiles(IFormCollection files);
+
+
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Model/LoginInfo.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Model/LoginInfo.cs"
index 95c2482..4a13a8a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Model/LoginInfo.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Model/LoginInfo.cs"
@@ -16,5 +16,11 @@
/// 浜鸿劯璇嗗埆
/// </summary>
public string? path { get; set; }
+
+
+ /// <summary>
+ /// 鐧惧害浜戝垎缁刦ace琛ㄤ腑鐨凣roupid
+ /// </summary>
+ //public string? groupid { get; set; }
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/Controllers/System/Sys_UserController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/Controllers/System/Sys_UserController.cs"
index 8678587..9baa7a0 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/Controllers/System/Sys_UserController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/Controllers/System/Sys_UserController.cs"
@@ -224,9 +224,31 @@
/// <param name="deleteUserDTO"></param>
/// <returns></returns>
[HttpPost, Route("DeleteUserData"), AllowAnonymous]
- public WebResponseContent DeleteUserData([FromBody] DeleteUserImg deleteUserDTO)
+ public WebResponseContent DeleteUserData(string userAccount)
{
- return Service.DeleteUserData(deleteUserDTO);
+ return Service.DeleteUserData(userAccount);
+ }
+
+
+ /// <summary>
+ /// 鐧诲叆鍚庢竻闄よ繖娆″叏閮ㄨ皟鐢⊿aveFaceFiles鏂规硶鐨勫浘鐗�
+ /// </summary>
+ /// <returns></returns>
+ [HttpGet,Route("CleanUnusedImages"),AllowAnonymous]
+ public WebResponseContent CleanUnusedImages()
+ {
+ return Service.CleanUnusedImages();
+ }
+
+ /// <summary>
+ ///浜鸿劯鐧诲叆鏃惰皟鐢ㄨ鏂规硶涓婁紶鍥剧墖
+ /// </summary>
+ /// <param name="files"></param>
+ /// <returns></returns>
+ [HttpPost, Route("SaveFaceFiles"), AllowAnonymous]
+ public WebResponseContent SaveFaceFiles(IFormCollection files)
+ {
+ return Service.SaveFaceFiles(files);
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/20250402172104.jpg" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/20250402172104.jpg"
deleted file mode 100644
index 837cc73..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/20250402172104.jpg"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/51dcb60a86eb571dca49c55e983918b.jpg" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/51dcb60a86eb571dca49c55e983918b.jpg"
deleted file mode 100644
index fc0853f..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/51dcb60a86eb571dca49c55e983918b.jpg"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/Snipaste_2025-04-02_14-19-25.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/Snipaste_2025-04-02_14-19-25.png"
deleted file mode 100644
index 8dc8740..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/Snipaste_2025-04-02_14-19-25.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/about.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/about.png"
deleted file mode 100644
index f28d373..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/about.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/brand.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/brand.png"
deleted file mode 100644
index 67c5a96..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/brand.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/car.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/car.png"
deleted file mode 100644
index 8b97fa1..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/car.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/files" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/files"
deleted file mode 100644
index 3d83fea..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/files"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/honor.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/honor.png"
deleted file mode 100644
index b115b49..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/honor.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/img1.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/img1.png"
deleted file mode 100644
index f490e6c..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/img1.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/logo.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/logo.png"
deleted file mode 100644
index afef62e..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/logo.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/newLogo.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/newLogo.png"
deleted file mode 100644
index a3646e6..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/newLogo.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/\345\276\256\344\277\241\345\233\276\347\211\207_20250402172104.jpg" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/\345\276\256\344\277\241\345\233\276\347\211\207_20250402172104.jpg"
deleted file mode 100644
index 837cc73..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server \346\255\243\345\274\217/WIDESEAWCS_Server/wwwroot/image/\345\276\256\344\277\241\345\233\276\347\211\207_20250402172104.jpg"
+++ /dev/null
Binary files differ
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 77d601d..5cb8eb1 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"
@@ -21,6 +21,7 @@
using WIDESEAWCS_Common;
using Newtonsoft.Json;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
+using System.Security.Policy;
namespace WIDESEAWCS_SystemServices
{
@@ -50,14 +51,121 @@
}
+ //#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
+
+
+ /// <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
@@ -66,46 +174,75 @@
}
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);//鏍规嵁杩欎釜鐢ㄦ埛鍚嶆潵鏌ョ湅鐢ㄦ埛
+ // 瀵嗙爜鐧诲綍
+ user = BaseDal.GetUserInfo(loginInfo.UserName, loginInfo.Password);
+ }
+
+ // 濡傛灉鎵惧埌鐢ㄦ埛
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("鏃犵櫥褰曟潈闄�");
- }
+
+ 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,
@@ -113,27 +250,34 @@
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 });
+ // 杩斿洖鍝嶅簲
+ 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);
@@ -141,6 +285,9 @@
return content;
}
+
+
+
public override WebResponseContent UpdateData(SaveModel saveModel)
{
@@ -533,6 +680,11 @@
return new WebResponseContent { Status = false, Message = "璇锋眰鏁版嵁涓虹┖锛屽彲鑳芥槸 JSON 瑙ｆ瀽澶辫触" };
}
+ 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
{
@@ -587,45 +739,50 @@
{
try
{
+ // 1. 鏌ヨ鐢ㄦ埛
var sys = BaseDal.QueryData(x => x.User_Id == addUserDTO.id).FirstOrDefault();
-
if (sys == null)
{
return new WebResponseContent { Status = false, Message = "娌℃壘鍒拌鐢ㄦ埛" };
}
- var face = _faceRecognitionRepository.QueryData().Select(x => x.GroupID).FirstOrDefault();
- // 鍒ゆ柇鏄惁闇�瑕佹洿鏂颁汉鑴稿浘鐗�
+
+ // 2. 鏌ヨ浜鸿劯搴撳垎缁� ID
+ var faceGroupID = _faceRecognitionRepository.QueryData().Select(x => x.GroupID).FirstOrDefault();
+
+ // 3. 鍒ゆ柇鏄惁闇�瑕佹洿鏂颁汉鑴镐俊鎭�
string faceToken = null;
- if (!string.IsNullOrEmpty(addUserDTO.path)) // 濡傛灉浼犱簡鍥剧墖璺緞锛屾墠鏇存柊浜鸿劯淇℃伅
+ if (!string.IsNullOrEmpty(addUserDTO.path)) // 鍙湁浼犱簡鏂板浘鐗囷紝鎵嶆洿鏂颁汉鑴镐俊鎭�
{
var baiduResult = BaiDuFaceHelper.AddUser(new BDUserInfo
{
ImgPath = addUserDTO.path,
user_id = addUserDTO.username,
- group_id = face // 杩欓噷搴旇濉櫨搴︿汉鑴稿簱鍒嗙粍
+ group_id = faceGroupID // 杩欓噷搴旇濉櫨搴︿汉鑴稿簱鍒嗙粍
});
- // 鍒ゆ柇鐧惧害杩斿洖鏄惁鎴愬姛
+
+ // 4. 鍒ゆ柇鐧惧害 API 鏄惁鎴愬姛
if (baiduResult == null || baiduResult.error_code != 0)
{
- return new WebResponseContent { Status = false, Data = "浜鸿劯浠ュ瓨鍦紝涓嶈閲嶅涓婁紶锛�" + baiduResult.error_msg };
+ return new WebResponseContent { Status = false, Message = "璇ュ浘鐗囦篃瀛樺湪锛屼笉瑕侀噸澶嶄笂浼狅細" + baiduResult.error_msg };
}
- // 鑾峰彇鏇存柊鍚庣殑 Face_token
- faceToken = baiduResult.result.face_token;
- // 鏇存柊鏌ヨ鍒扮殑鐢ㄦ埛鏁版嵁
- sys.UserName = addUserDTO.username;
- sys.UserTrueName = addUserDTO.usertruename;
- sys.HeadImageUrl = addUserDTO.path; // 鏇存柊澶村儚璺緞锛堝鏋滄湁鏂拌矾寰勶級
+ // 5. 鍙湁褰撲笂浼犱簡鏂板浘鐗囧苟鎴愬姛鏃讹紝鎵嶆洿鏂拌繖浜涘瓧娈�
+ faceToken = baiduResult.result.face_token;
sys.Log_id = baiduResult.log_id;
- //濡傛灉 faceToken 涓嶆槸 null锛屽氨鎶� faceToken 璧嬪�肩粰 sys.Face_token锛涘惁鍒欙紝淇濇寔 sys.Face_token 鐨勫師鍊间笉鍙樸��
- sys.Face_token = faceToken ?? sys.Face_token;
- sys.PhoneNo = addUserDTO.phoneno;
- sys.Role_Id = addUserDTO.roleid;
- sys.RoleName = addUserDTO.rolename;
- sys.Enable = addUserDTO.enable;
- // 鏇存柊鏁版嵁搴�
- BaseDal.UpdateData(sys);
+ sys.HeadImageUrl = addUserDTO.path;
}
+
+ // 6. 鏇存柊鐢ㄦ埛鍏朵粬淇℃伅
+ sys.UserName = addUserDTO.username;
+ sys.UserTrueName = addUserDTO.usertruename;
+ sys.Face_token = faceToken ?? sys.Face_token; // 鍙湁褰� faceToken 鏈夊�兼椂鎵嶆洿鏂帮紝鍚﹀垯淇濇寔鍘熷��
+ sys.PhoneNo = addUserDTO.phoneno;
+ sys.Role_Id = addUserDTO.roleid;
+ sys.RoleName = addUserDTO.rolename;
+ sys.Enable = addUserDTO.enable;
+
+ // 7. 鏇存柊鏁版嵁搴�
+ BaseDal.UpdateData(sys);
return new WebResponseContent { Status = true, Data = sys };
}
@@ -637,24 +794,32 @@
+
/// <summary>
/// 鍒犻櫎
/// </summary>
/// <param name="deleteUserDTO"></param>
/// <returns></returns>
- public WebResponseContent DeleteUserData(DeleteUserImg deleteUserDTO)
+ public WebResponseContent DeleteUserData(string account)
{
try
{
-
- string apiResult = BaiDuFaceHelper.DeleteUser(deleteUserDTO);//鍙缁檛oken鍜宭og_id
+
+ // 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);//鍙缁檛oken鍜宭og_id
// 2. 瑙ｆ瀽杩斿洖缁撴灉锛屽垽鏂垹闄ゆ槸鍚︽垚鍔�
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);
@@ -673,7 +838,88 @@
}
-
+ 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", "UploadfaceImage");
+ // 濡傛灉鏂囦欢澶逛笉瀛樺湪锛岃繑鍥為敊璇俊鎭�
+ if (!Directory.Exists(pathimage))
+ {
+ return new WebResponseContent { Status = false, Message = "鍥剧墖鏂囦欢澶逛笉瀛樺湪" };
+ }
+
+ //鑾峰彇鏁版嵁搴撲腑鎵�鏈夌殑鍥剧墖锛堟帓闄や负绌猴級 鐜板湪鍥剧墖鍙繚瀛樹簡鏂囦欢鍚�
+ var userImage = BaseDal.QueryData(x => !string.IsNullOrEmpty(x.HeadImageUrl)).Select(x => x.HeadImageUrl).ToList();
+
+ //鑾峰彇鏂囦欢澶逛腑鎵�鏈夌殑鍥剧墖鏂囦欢
+ var imageFiles = Directory.GetFiles(pathimage).Select(Path.GetFileName).ToList();
+ int deletedCount = 0;
+ foreach (var file in imageFiles)
+ {
+ if (!userImage.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}" };
+ }
+ }
}
}
--
Gitblit v1.9.3