From 1dcc7b63a20daad7c7060f18878d8e8dbaad02de Mon Sep 17 00:00:00 2001
From: qiuyao <qiuyao@hnkhzn.com>
Date: 星期一, 28 四月 2025 16:41:31 +0800
Subject: [PATCH] 解决冲突
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs | 180 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 147 insertions(+), 33 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs"
index c20cabf..2fabccf 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs"
@@ -14,6 +14,7 @@
using Microsoft.AspNetCore.Http;
using Newtonsoft.Json;
using WIDESEAWCS_Common;
+using FaceAI;
namespace WIDESEAWCS_SystemServices
{
@@ -129,6 +130,9 @@
}
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();
@@ -198,19 +202,23 @@
LoginTiem =DateTime.Now,
CreateDate = DateTime.Now
};
+
// 淇濆瓨鐢ㄦ埛鐧诲綍淇℃伅
_cacheService.AddOrUpdate(user.UserId.ToString(), token);
- _LoginhsyServer.AddData(loghis);
+ _LoginhsyServer.AddData(loghis);
+ // var id= _LoginhsyServer.Db.Insertable(loghis).ExecuteReturnIdentity();
+
// 杩斿洖鍝嶅簲
content = WebResponseContent.Instance.OK(data: new
{
token,
- userName = user.UserTrueName,
+ userName = user.UserName,
img = user.HeadImageUrl,
ID = user.UserId,
- RoleId = user.RoleId
+ RoleId = user.RoleId,
+
});
}
else
@@ -220,12 +228,59 @@
}
catch (Exception ex)
{
- content = WebResponseContent.Instance.Error(ex.Message);
+ content = WebResponseContent.Instance.Error("鐧诲綍寮傚父: " + ex.ToString());
}
return content;
}
+ /// <summary>
+ /// 1:N 浜鸿劯鎼滅储鎺ュ彛
+ /// </summary>
+ /// <param name="image">鍥剧墖淇℃伅(**鎬绘暟鎹ぇ灏忓簲灏忎簬10M**)锛屽浘鐗囦笂浼犳柟寮忔牴鎹甶mage_type鏉ュ垽鏂�</param>
+ /// <param name="imageType">鍥剧墖绫诲瀷 <br> **BASE64**:鍥剧墖鐨刡ase64鍊硷紝base64缂栫爜鍚庣殑鍥剧墖鏁版嵁锛岀紪鐮佸悗鐨勫浘鐗囧ぇ灏忎笉瓒呰繃2M锛� <br>**URL**:鍥剧墖鐨� URL鍦板潃( 鍙兘鐢变簬缃戠粶绛夊師鍥犲鑷翠笅杞藉浘鐗囨椂闂磋繃闀�)锛� <br>**FACE_TOKEN**: 浜鸿劯鍥剧墖鐨勫敮涓�鏍囪瘑锛岃皟鐢ㄤ汉鑴告娴嬫帴鍙ｆ椂锛屼細涓烘瘡涓汉鑴稿浘鐗囪祴浜堜竴涓敮涓�鐨凢ACE_TOKEN锛屽悓涓�寮犲浘鐗囧娆℃娴嬪緱鍒扮殑FACE_TOKEN鏄悓涓�涓��</param>
+ /// <param name="groupIdList">浠庢寚瀹氱殑group涓繘琛屾煡鎵� 鐢ㄩ�楀彿鍒嗛殧锛�**涓婇檺20涓�**</param>
+ /// </param>
+ /// <return>JObject</return>
+ ///
+ public string FaceSearch(string image, string imageType, string groupIdList, string userId)
+ {
+ string result = "";
+ switch (imageType)
+ {
+ case "base64":
+ //result = FaceCompare.FaceIdentifyByBuffer(image, groupIdList, userId);
+ break;
+ case "url":
+ result = FaceCompare.FaceIdentify(image, groupIdList, userId);
+ break;
+ case "token":
+ result = FaceCompare.FaceIdentifyByFeature(image, groupIdList, userId);
+ break;
+ default:
+ break;
+ }
+ return result;
+ }
+
+ /// <summary>
+ /// 閫氳繃鐗瑰緛鍊兼瘮瀵癸紙1:1锛� 瀵逛汉鑴哥壒寰佸�艰繘琛屾瘮杈冿紝鍙繑鍥炰汉鑴哥壒寰佺浉浼煎垎鍊硷紙鐧惧垎鍒讹級
+ /// </summary>
+ /// <param name="file1">浼犲浘鐗囪矾寰�</param>
+ /// <param name="file2">浼犲浘鐗囪矾寰�</param>
+ /// <returns></returns>
+ public string FaceCompareFeature(string file1, string file2)
+ {
+ try
+ {
+ string result = FaceCompare.FaceCompareFeature(file1, file2);
+ return result;
+ }
+ catch (Exception e)
+ {
+ throw e;
+ }
+ }
public override WebResponseContent UpdateData(SaveModel saveModel)
{
UpdateIgnoreColOnExecute = x =>
@@ -465,7 +520,7 @@
{
return new WebResponseContent { Status = false, Message = "璐﹀彿閲嶅锛岃閲嶆柊褰曞叆" };
}
- var face = _faceServer.QueryData().Select(x => x.GroupID).FirstOrDefault(); ;
+ var face = _faceServer.QueryData().Select(x => x.GroupID).FirstOrDefault();
var baiduResult = BaiDuFaceHelper.AddUser(new BDUserInfo
{
ImgPath = addUserDTO.path,
@@ -511,7 +566,7 @@
/// <summary>
- /// 鏇存柊鐢ㄦ埛
+ ///鐧惧害浜� 鏇存柊鐢ㄦ埛
/// </summary>
/// <param name="addUserDTO"></param>
/// <returns></returns>
@@ -520,48 +575,57 @@
try
{
// 1. 鏌ヨ鐢ㄦ埛
- var sys = BaseDal.QueryData(x => x.User_Id == addUserDTO.id).FirstOrDefault();
+ var userList = BaseDal.QueryData();
+ var sys = userList.FirstOrDefault(x => x.User_Id == addUserDTO.id);
if (sys == null)
{
return new WebResponseContent { Status = false, Message = "娌℃壘鍒拌鐢ㄦ埛" };
}
- // 2. 鏌ヨ浜鸿劯搴撳垎缁� ID
- var faceGroupID = _faceServer.QueryData().Select(x => x.GroupID).FirstOrDefault();
-
- // 3. 鍒ゆ柇鏄惁闇�瑕佹洿鏂颁汉鑴镐俊鎭�
- string faceToken = null;
- if (!string.IsNullOrEmpty(addUserDTO.path)) // 鍙湁浼犱簡鏂板浘鐗囷紝鎵嶆洿鏂颁汉鑴镐俊鎭�
+ // 2. 妫�鏌ヨ处鍙锋槸鍚︿慨鏀癸紝骞跺垽鏂槸鍚﹂噸澶�//StringComparison.OrdinalIgnoreCase锛氳〃绀哄拷鐣ュぇ灏忓啓杩涜姣旇緝锛屾瘮濡� "admin" 鍜� "ADMIN" 涔熻涓烘槸鐩哥瓑鐨�
+ if (!string.Equals(sys.UserName ,addUserDTO.username))
{
- var baiduResult = BaiDuFaceHelper.AddUser(new BDUserInfo
+ var existUser = userList.FirstOrDefault(a => a.UserName == addUserDTO.username);
+ if (existUser != null)
{
- ImgPath = addUserDTO.path,
- user_id = addUserDTO.username,
- group_id = faceGroupID // 杩欓噷搴旇濉櫨搴︿汉鑴稿簱鍒嗙粍
- });
-
- // 4. 鍒ゆ柇鐧惧害 API 鏄惁鎴愬姛
- if (baiduResult == null || baiduResult.error_code != 0)
- {
- return new WebResponseContent { Status = false, Message = "璇ュ浘鐗囦篃瀛樺湪锛屼笉瑕侀噸澶嶄笂浼狅細" + baiduResult.error_msg };
+ return new WebResponseContent { Status = false, Message = "璐﹀彿閲嶅锛岃閲嶆柊褰曞叆" };
}
-
- // 5. 鍙湁褰撲笂浼犱簡鏂板浘鐗囧苟鎴愬姛鏃讹紝鎵嶆洿鏂拌繖浜涘瓧娈�
- faceToken = baiduResult.result.face_token;
- sys.Log_id = baiduResult.log_id;
- sys.HeadImageUrl = addUserDTO.path;
+ sys.UserName = addUserDTO.username; // 纭鍙互鏀规椂鎵嶄慨鏀�
}
- // 6. 鏇存柊鐢ㄦ埛鍏朵粬淇℃伅
- sys.UserName = addUserDTO.username;
+ // 3. 鏇存柊鍏朵粬鐢ㄦ埛淇℃伅
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. 鏇存柊鏁版嵁搴�
+ // 4. 鏌ヨ浜鸿劯搴撳垎缁� ID
+ var faceGroupID = _faceServer.QueryData().Select(x => x.GroupID).FirstOrDefault();
+
+ // 5. 鍒ゆ柇鏄惁闇�瑕佹洿鏂颁汉鑴镐俊鎭�
+ if (!string.Equals(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 };
@@ -571,6 +635,7 @@
return new WebResponseContent { Status = false, Message = "澶辫触锛�" + ex.Message };
}
}
+
@@ -624,7 +689,7 @@
return new WebResponseContent { Status = false, Message = "璇蜂笂浼犳枃浠�" };
// 1. 纭繚瀛樺偍鐩綍瀛樺湪
- string baseDirectory = Path.Combine(Directory.GetCurrentDirectory(), "wwwroot", "UploadfaceImage");
+ string baseDirectory = Path.Combine(Directory.GetCurrentDirectory(), "wwwroot", "image");
if (!Directory.Exists(baseDirectory))
Directory.CreateDirectory(baseDirectory);
@@ -716,5 +781,54 @@
{
return BaseDal.QueryFirst(x => x.UserName == userName && x.UserPwd == password, x => new UserInfo { HeadImageUrl = x.HeadImageUrl, RoleId = x.Role_Id, TenantId = x.TenantId, UserId = x.User_Id, UserName = x.UserName, UserTrueName = x.UserTrueName });
}
+
+ /// <summary>
+ /// 浜鸿劯鍒犻櫎锛堝垹闄ょ敤鎴风殑鏌愪竴寮犱汉鑴革紝濡傛灉璇ョ敤鎴峰彧鏈変竴寮犱汉鑴稿浘鐗囷紝鍒欏悓鏃跺垹闄ょ敤鎴枫�傦級
+ /// </summary>
+ /// <param name="addUserDTO"></param>
+ /// <returns></returns>
+ /// <exception cref="NotImplementedException"></exception>
+ public WebResponseContent DeleteUserIsface(string account)
+ {
+ try
+ {
+
+ // 1. 鏌ヨ浜鸿劯搴撳垎缁� ID
+ var faceGroupID = _faceServer.QueryData().Select(x => x.GroupID).FirstOrDefault();
+ //2.鏌ヨ瑕佸垹閭ｄ釜鐢ㄦ埛鐨�
+ 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. 瑙ｆ瀽杩斿洖缁撴灉锛屽垽鏂垹闄ゆ槸鍚︽垚鍔�
+ 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