yanjinhui
2025-04-11 cd58c94a09b82528956c2607f580355b0c0cc912
优化更新人脸识别
已修改5个文件
152 ■■■■ 文件已修改
项目代码/WIDESEAWCS_Server 正式/WIDESEAWCS_Common/BaiDuFaceHelper.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WIDESEAWCS_Server 正式/WIDESEAWCS_DTO/SerialPort/AddUserDTO.cs 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WIDESEAWCS_Server 正式/WIDESEAWCS_ISystemServices/ISys_UserService.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WIDESEAWCS_Server 正式/WIDESEAWCS_Server/Controllers/System/Sys_UserController.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WIDESEAWCS_Server 正式/WIDESEAWCS_SystemServices/Sys_UserService.cs 123 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ÏîÄ¿´úÂë/WIDESEAWCS_Server Õýʽ/WIDESEAWCS_Common/BaiDuFaceHelper.cs
@@ -351,7 +351,7 @@
        /// <summary>
        /// è¯·æ±‚标识码,随机数,唯一
        /// </summary>
        public int log_id { get; set;}
        public string  log_id { get; set;}
        /// <summary>
        /// ç”¨æˆ·id(由数字、字母、下划线组成),长度限制48B
        /// </summary>
ÏîÄ¿´úÂë/WIDESEAWCS_Server Õýʽ/WIDESEAWCS_DTO/SerialPort/AddUserDTO.cs
@@ -17,12 +17,10 @@
        public string usertruename { get; set; }
        /// <summary>
        /// ç™¾åº¦äº‘分组
        /// </summary>
      //  public int log_id { get; set; }
        public string  phoneno { get; set; }
        /// <summary>
@@ -50,8 +48,11 @@
        /// <summary>
        /// å›¾ç‰‡token
        /// </summary>
        //public string ?face_token { get; set; }
        public string ?face_token { get; set; }
        /// <summary>
        /// ç™¾åº¦äº‘分组
        /// </summary>
       public int? log_id { get; set; }
    }
}
ÏîÄ¿´úÂë/WIDESEAWCS_Server Õýʽ/WIDESEAWCS_ISystemServices/ISys_UserService.cs
@@ -96,6 +96,9 @@
        /// <returns></returns>
        WebResponseContent SaveFaceFiles(IFormCollection files);
        //人脸删除(删除用户的某一张人脸,如果该用户只有一张人脸图片,则同时删除用户。)
        WebResponseContent DeleteUserIsface(string account);
    }
}
ÏîÄ¿´úÂë/WIDESEAWCS_Server Õýʽ/WIDESEAWCS_Server/Controllers/System/Sys_UserController.cs
@@ -251,6 +251,17 @@
            return Service.SaveFaceFiles(files);
        }
        /// <summary>
        ///  //人脸删除(删除用户的某一张人脸,如果该用户只有一张人脸图片,则同时删除用户。)
        /// </summary>
        /// <param name="addUserDTO"></param>
        /// <returns></returns>
        [HttpPost, Route("DeleteUserIsface"), AllowAnonymous]
        public WebResponseContent DeleteUserIsface(string account)
        {
            return Service.DeleteUserIsface(account);
        }
    }
       
ÏîÄ¿´úÂë/WIDESEAWCS_Server Õýʽ/WIDESEAWCS_SystemServices/Sys_UserService.cs
@@ -421,7 +421,12 @@
            }
        }
        /// <summary>
        /// æ ¹æ®ç”¨æˆ·ç»„来查看当前作业的权限
        /// </summary>
        /// <param name="userId">用户id</param>
        /// <param name="group">用户分组</param>
        /// <returns></returns>
        public WebResponseContent PermissionView(int userId, string group)
        {
            try
@@ -739,55 +744,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 = _faceRecognitionRepository.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 = _faceRecognitionRepository.QueryData().Select(x => x.GroupID).FirstOrDefault();
                // 5. åˆ¤æ–­æ˜¯å¦éœ€è¦æ›´æ–°äººè„¸ä¿¡æ¯Equals æ˜¯ .NET ä¸­ç”¨äºŽæ¯”较两个对象是否相等
                if (!string.Equals(sys.HeadImageUrl, addUserDTO.path)) // æœ‰æ–°å›¾ç‰‡æ‰å¤„理人脸注册=> å‰é¢çš„写法等于=if (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 };
@@ -797,6 +805,7 @@
                return new WebResponseContent { Status = false, Message = "失败:" + ex.Message };
            }
        }
@@ -818,7 +827,7 @@
                deleteUserImg.group_id = faceGroupID;
                deleteUserImg.user_id = account;
                string apiResult = BaiDuFaceHelper.DeleteUser(deleteUserImg);//只要给token和log_id
                string apiResult = BaiDuFaceHelper.DeleteUser(deleteUserImg);//只要给用户账号和用户组id
                // 2. è§£æžè¿”回结果,判断删除是否成功
                dynamic resultObj = JsonConvert.DeserializeObject(apiResult);
@@ -932,6 +941,54 @@
            }
        }
        /// <summary>
        /// äººè„¸åˆ é™¤ï¼ˆåˆ é™¤ç”¨æˆ·çš„æŸä¸€å¼ äººè„¸ï¼Œå¦‚果该用户只有一张人脸图片,则同时删除用户。)
        /// </summary>
        /// <param name="addUserDTO"></param>
        /// <returns></returns>
        /// <exception cref="NotImplementedException"></exception>
        public WebResponseContent DeleteUserIsface(string account)
        {
            try
            {
                // 1. æŸ¥è¯¢äººè„¸åº“分组 ID
                var faceGroupID = _faceRecognitionRepository.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);
            }
        }
    }
}