From 20f099aee8715510406bf46c5e8ff4a8f5d532df Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期三, 02 四月 2025 16:27:19 +0800
Subject: [PATCH] 111
---
项目代码/WIDESEAWCS_Server 正式/WIDESEAWCS_SystemServices/Sys_UserService.cs | 103 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 71 insertions(+), 32 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..2f18d6d 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,7 @@
using WIDESEAWCS_DTO.Telescopic;
using WIDESEAWCS_Common;
using Newtonsoft.Json;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
namespace WIDESEAWCS_SystemServices
{
@@ -463,7 +464,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,6 +482,8 @@
var result = query.Select((a, b) => new
{
+ a.UserPwd,
+ a.Log_id,
a.User_Id,
a.UserName,
a.UserTrueName,
@@ -514,17 +517,27 @@
}
}
-
+ /// <summary>
+ /// 娣诲姞鐢ㄦ埛
+ /// </summary>
+ /// <param name="addUserDTO"></param>
+ /// <returns></returns>
public WebResponseContent AdduserData(AddUserDTO addUserDTO)
{
try
{
+ if (addUserDTO == null)
+ {
+ return new WebResponseContent { Status = false, Message = "璇锋眰鏁版嵁涓虹┖锛屽彲鑳芥槸 JSON 瑙ｆ瀽澶辫触" };
+ }
+ 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 +545,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 = face,
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,48 +575,70 @@
}
+
+ /// <summary>
+ /// 鏇存柊鐢ㄦ埛
+ /// </summary>
+ /// <param name="addUserDTO"></param>
+ /// <returns></returns>
public WebResponseContent UpuserData(AddUserDTO addUserDTO)
{
try
{
-
- var baiduResult = BaiDuFaceHelper.AddUser(new BDUserInfo
+ var sys = BaseDal.QueryData(x => x.User_Id == addUserDTO.id).FirstOrDefault();
+
+ 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, Message = "娌℃壘鍒拌鐢ㄦ埛" };
+ }
+ var face = _faceRecognitionRepository.QueryData().Select(x => x.GroupID).FirstOrDefault();
+ // 鍒ゆ柇鏄惁闇�瑕佹洿鏂颁汉鑴稿浘鐗�
+ string faceToken = null;
+ if (!string.IsNullOrEmpty(addUserDTO.path)) // 濡傛灉浼犱簡鍥剧墖璺緞锛屾墠鏇存柊浜鸿劯淇℃伅
{
- return new WebResponseContent { Status = false, Data = "浜鸿劯鏇存柊澶辫触锛�" + baiduResult.error_msg };
+ var baiduResult = BaiDuFaceHelper.AddUser(new BDUserInfo
+ {
+ ImgPath = addUserDTO.path,
+ user_id = addUserDTO.username,
+ group_id = face // 杩欓噷搴旇濉櫨搴︿汉鑴稿簱鍒嗙粍
+ });
+
+ // 鍒ゆ柇鐧惧害杩斿洖鏄惁鎴愬姛
+ if (baiduResult == null || baiduResult.error_code != 0)
+ {
+ return new WebResponseContent { Status = false, Data = "浜鸿劯浠ュ瓨鍦紝涓嶈閲嶅涓婁紶锛�" + baiduResult.error_msg };
+ }
+ // 鑾峰彇鏇存柊鍚庣殑 Face_token
+ faceToken = baiduResult.result.face_token;
}
- // 鏇存柊鐢ㄦ埛鏁版嵁
- 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,
- };
+ // 鏌ヨ鐜版湁鐢ㄦ埛
+
+
+ // 鏇存柊鏌ヨ鍒扮殑鐢ㄦ埛鏁版嵁
+ sys.UserName = addUserDTO.username;
+ sys.UserTrueName = addUserDTO.usertruename;
+ sys.HeadImageUrl = addUserDTO.path; // 鏇存柊澶村儚璺緞锛堝鏋滄湁鏂拌矾寰勶級
+ sys.Log_id = face;
+ //sys.Face_token = faceToken ?? addUserDTO.face_token; // 濡傛灉娌℃湁鏇存柊鍥剧墖锛屼繚鎸佸師鏈� Face_token
+ sys.Face_token = faceToken; // 濡傛灉娌℃湁鏇存柊鍥剧墖锛屼繚鎸佸師鏈� Face_token
+ sys.PhoneNo = addUserDTO.phoneno;
+ sys.Role_Id = addUserDTO.roleid;
+ sys.RoleName = addUserDTO.rolename;
+ sys.Enable = addUserDTO.enable;
+
+ // 鏇存柊鏁版嵁搴�
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>
/// 鍒犻櫎
@@ -611,7 +650,7 @@
try
{
- string apiResult = BaiDuFaceHelper.DeleteUser(deleteUserDTO);
+ string apiResult = BaiDuFaceHelper.DeleteUser(deleteUserDTO);//鍙缁檛oken鍜宭og_id
// 2. 瑙ｆ瀽杩斿洖缁撴灉锛屽垽鏂垹闄ゆ槸鍚︽垚鍔�
dynamic resultObj = JsonConvert.DeserializeObject(apiResult);
--
Gitblit v1.9.3