From 755b60c531999e9d3c0a94759a2a5e92f5e4ad4e Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 25 三月 2024 14:18:01 +0800
Subject: [PATCH] 整理

---
 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
index f4066e7..852ec47 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
@@ -365,7 +365,7 @@
         dealMemberRoleEmpowerDo(cards,member,deviceRoleMapper,empowerMapper,deviceMapper);
     }
 
-    public static void dealMemberRoleEmpowerDo(List<MemberCard> cards,Member member , DeviceRoleMapper deviceRoleMapper, EmpowerMapper empowerMapper, DeviceMapper deviceMapper) {
+    public static void dealMemberRoleEmpowerDo(List<MemberCard> cards1,Member member , DeviceRoleMapper deviceRoleMapper, EmpowerMapper empowerMapper, DeviceMapper deviceMapper) {
         List<Integer> doorIds = getRoleIdByParam(member,deviceRoleMapper);
         if(doorIds==null || doorIds.size() == 0){
             //濡傛灉鏉冮檺娓呯┖锛屽垯娓呯┖浜哄憳鎺堟潈鐨勬潈闄愭暟鎹�
@@ -376,7 +376,8 @@
                     .set(Empower::getSendStatus,Constants.ZERO));
             return;
         }
-        if((cards == null || cards.size() == 0) && StringUtils.isBlank(member.getFaceId())){
+//        if((cards == null || cards.size() == 0) && StringUtils.isBlank(member.getFaceId())){
+        if( StringUtils.isBlank(member.getFaceId())){
             //濡傛灉娌℃湁鍗� 涔熸病鏈変汉鑴�
             return;
         }
@@ -593,15 +594,19 @@
             //澶勭悊鏂板鏁版嵁
             BaseResponse result =  HKService.editUser(addHkModel);
             if(result !=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE) ){
-                if(StringUtils.isNotBlank(c.getFaceImg())){
+                if(StringUtils.isNotBlank(c.getFaceImg()) && Constants.equalsInteger(c.getFaceStatus(),Constants.ZERO)){
                     //濡傛灉鏈変汉鑴哥収鐗囷紝澶勭悊浜鸿劯鐓х墖鍚屾
                     String faceid = dealMemberFace(c,path);
                     if(StringUtils.isBlank(faceid)){
                         noticeErpFail(c,Constants.ZERO,"浜鸿劯淇℃伅鏇存柊澶辫触锛岃妫�鏌ヤ汉鑴哥収鐗囨槸鍚﹀悎娉曪紒");
                         c.setHkStatus(Constants.TWO);
+                        c.setFaceStatus(Constants.TWO);
                         c.setRemark("浜鸿劯淇℃伅鏇存柊澶辫触锛岃妫�鏌ヤ汉鑴哥収鐗囨槸鍚﹀悎娉曪紒锛�"+result.getMsg());
                     }else{
                         c.setFaceId(faceid);
+                        c.setFaceStatus(Constants.ONE);
+                        //濡傛灉浜鸿劯璺熶綘锛岄噸鏂颁笅鍙戞潈闄愭暟鎹�
+                         dealMemberRoleEmpower(c);
                     }
                 }
             }else{
@@ -609,8 +614,7 @@
                 c.setHkStatus(Constants.TWO);
                 c.setRemark("浜哄憳淇℃伅鍚屾瀹夐槻骞冲彴鏇存柊澶辫触锛岃淇鍚庨噸璇曪紒锛�"+(result!=null?result.getCode()+result.getMsg():""));
             }
-            //閲嶆柊涓嬪彂鏉冮檺鏁版嵁
-            dealMemberRoleEmpower(c);
+
         }
         c.setHkDate(date);
         memberMapper.updateById(c);
@@ -651,7 +655,7 @@
             c.setHkId(addHkModel.getPersonId());
             c.setHkDate(new Date());
             memberMapper.updateById(c);
-            dealMemberRoleEmpower(c);
+//            dealMemberRoleEmpower(c);
             return  true;
         }else{
             noticeErpFail(c,Constants.ZERO,"浜哄憳淇℃伅鍚屾瀹夐槻骞冲彴澶辫触锛岃淇鍚庨噸璇曪紒"+result.getCode()+result.getMsg());
@@ -669,7 +673,7 @@
      * @param path
      * @return
      */
-    private String dealMemberFace(Member c,String path) {
+    public static String dealMemberFace(Member c,String path) {
         if(StringUtils.isBlank(c.getFaceId())){
             BaseResponse<FaceAddOrEditesponse> response = HKService.addFace(getFaceAddModel(c,path));
             if(response !=null && StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE)&& response.getData()!=null ){
@@ -774,7 +778,7 @@
         }
         return  model;
     }
-    private FaceAddRequest getFaceAddModel(Member c,String path) {
+    public static FaceAddRequest getFaceAddModel(Member c,String path) {
         FaceAddRequest model = new FaceAddRequest();
         model.setPersonId(c.getHkId());
         if(StringUtils.isNotBlank(c.getFaceImg())){
@@ -787,7 +791,7 @@
         }
         return  model;
     }
-    private FaceEditRequest getFaceUpdateModel(Member c,String path) {
+    public static FaceEditRequest getFaceUpdateModel(Member c,String path) {
         FaceEditRequest model = new FaceEditRequest();
         model.setFaceId(c.getFaceId());
         if(StringUtils.isNotBlank(c.getFaceImg())){

--
Gitblit v1.9.3