通讯录

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DealSyncOperationApiServiceImpl.java

@@ -930,7 +930,6 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
             RedisUtil.lock(key, 3L);
             TabHaobanSyncTask syncTask = syncTaskService.getSyncTask(taskId);
             String wxEnterpriseId = syncTask.getWxEnterpriseId();
-            //同步成功 进入门店处理
             this.unlockTask(wxEnterpriseId) ;
             logger.info("同步通讯录完成");
             RedisUtil.unlock(key);

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/QywxDeptSyncOperation.java

@@ -141,19 +141,38 @@ public class QywxDeptSyncOperation implements BaseSyncOperation {
         } finally {
             if (!resultFlag) {
                 dealException(dealParamMqDTO.getTaskId(), dealParamMqDTO.getData(), dataPre.getEnterpriseId(), reason);
+                this.dealSyncOperationApiService.unlockTask(wxEnterpriseId) ;
             } else {
                 dealSuccess(dealParamMqDTO.getTaskId(), dealParamMqDTO.getData(), dataPre.getEnterpriseId(), dataPre.getWxEnterpriseId());
             }
         }
-
     }
 
     @Override
     public void dealException(String taskId, String dataId, String enterpriseId, String reason) {
         logger.info("部门同步异常：{},{}", taskId, dataId);
-        preDealService.updateStatusByDataId(taskId, dataId, PreDealTypeEnum.dept.getVal(), PreDealStatusEnum.exception.getVal(), reason);
+        this.preDealService.updateStatusByDataId(taskId, dataId, PreDealTypeEnum.dept.getVal(), PreDealStatusEnum.exception.getVal(), reason);
+    }
+
+    @Override
+    public void dealSuccess(String taskId, String dataId, String enterpriseId, String wxEnterpriseId) {
+        boolean b = preDealService.updateStatusByDataId(taskId, dataId, PreDealTypeEnum.dept.getVal(), PreDealStatusEnum.computed.getVal(), "成功");
+        if (!b) {
+            logger.info("成功修改错误！{}", dataId);
+            return;
+        }
+        List<TabHaobanPreDealLog> preList = preDealService.listByPDataId(taskId, dataId,0);
+        if (CollectionUtils.isNotEmpty(preList)) {
+            Set<String> mid = preList.stream().map(tab -> tab.getDataId()).collect(Collectors.toSet());
+            this.dealSyncOperationApiService.sendToMq(taskId,mid,SyncTaskStatusEnum.group_sync,"departmentSyncDealMq2");
+        }
+    }
+
+    private void update(String taskId, String dataId, String enterpriseId, String reason) {
+
     }
 
+
     private String getStaff(String taskId, String dataId, String enterpriseId, String wxEnterpriseId,SecretSettingDTO secretSetting,WxEnterpriseQwDTO qwDTO) {
         if("1".equals(dataId)) {
             List<UserDTO> list = null ;
@@ -187,19 +206,6 @@ public class QywxDeptSyncOperation implements BaseSyncOperation {
         }
         return null ;
     }
-    @Override
-    public void dealSuccess(String taskId, String dataId, String enterpriseId, String wxEnterpriseId) {
-        boolean b = preDealService.updateStatusByDataId(taskId, dataId, PreDealTypeEnum.dept.getVal(), PreDealStatusEnum.computed.getVal(), "成功");
-        if (!b) {
-            logger.info("成功修改错误！{}", dataId);
-            return;
-        }
-        List<TabHaobanPreDealLog> preList = preDealService.listByPDataId(taskId, dataId,0);
-        if (CollectionUtils.isNotEmpty(preList)) {
-            Set<String> mid = preList.stream().map(tab -> tab.getDataId()).collect(Collectors.toSet());
-            this.dealSyncOperationApiService.sendToMq(taskId,mid,SyncTaskStatusEnum.group_sync,"departmentSyncDealMq2");
-        }
-    }
 
     @Override
     public void checkDepartmentTask(String taskId) {