解决冲突

qiuyao

2025-04-28 1dcc7b63a20daad7c7060f18878d8e8dbaad02de

 ÏîÄ¿´úÂë/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();
@@ -230,6 +234,53 @@
            return content;
        }

        /// <summary>
        /// 1:N äººè„¸æœç´¢æŽ¥å£
        /// </summary>
        /// <param name="image">图片信息(**总数据大小应小于10M**)，图片上传方式根据image_type来判断</param>
        /// <param name="imageType">图片类型     <br> **BASE64**:图片的base64值，base64编码后的图片数据，编码后的图片大小不超过2M； <br>**URL**:图片的 URL地址( å¯èƒ½ç”±äºŽç½‘络等原因导致下载图片时间过长)； <br>**FACE_TOKEN**: äººè„¸å›¾ç‰‡çš„唯一标识，调用人脸检测接口时，会为每个人脸图片赋予一个唯一的FACE_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 =>
@@ -469,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,
@@ -523,55 +574,58 @@
        {
            try
            {

                // 1. æŸ¥è¯¢ç”¨æˆ·
                var user = BaseDal.QueryData();
                var sys = user.Where(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;
                var list = user.Where(a => a.UserName == addUserDTO.username).FirstOrDefault();
                if (list != null)

                // 4. æŸ¥è¯¢äººè„¸åº“分组 ID
                var faceGroupID = _faceServer.QueryData().Select(x => x.GroupID).FirstOrDefault();

                // 5. åˆ¤æ–­æ˜¯å¦éœ€è¦æ›´æ–°äººè„¸ä¿¡æ¯
                if (!string.Equals(sys.HeadImageUrl,addUserDTO.path)) // æœ‰æ–°å›¾ç‰‡æ‰å¤„理人脸注册
                {
                    return new WebResponseContent { Status = false, Message = "账号重复，请重新录入" };
                    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;
                }
                // 7. æ›´æ–°æ•°æ®åº“

                // 8. æ›´æ–°æ•°æ®åº“
                BaseDal.UpdateData(sys);

                return new WebResponseContent { Status = true, Data = sys };
@@ -581,6 +635,7 @@
                return new WebResponseContent { Status = false, Message = "失败：" + ex.Message };
            }
        }




@@ -726,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);//给用户账号/用户组id/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);
            }
        }
    }
}