通讯录

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

@@ -715,7 +715,8 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
         if(StringUtils.isEmpty(mqName)) {
             mqName = "departmentSyncDealMq" ;
         }
-        if(!syncTaskStatusEnum.equals(SyncTaskStatusEnum.clerk_sync)) {
+        // 通讯录同步不要更新状态
+        if(!(syncTaskStatusEnum.equals(SyncTaskStatusEnum.clerk_sync) || syncTaskStatusEnum.equals(SyncTaskStatusEnum.group_sync))) {
             syncTaskService.updateTaskStatus(taskId, syncTaskStatusEnum.getVal());
         }
         List<String> listRet = dealList.stream().map(relationId -> {

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

@@ -62,8 +62,6 @@ public class QywxDeptSyncOperation implements BaseSyncOperation {
     @Autowired
     private WxEnterpriseService wxEnterpriseService;
     @Autowired
-    private QywxStaffSyncOperation qywxClerkSyncOperation;
-    @Autowired
     private SecretSettingService secretSettingService;
     @Autowired
     private Config config;
@@ -199,32 +197,11 @@ public class QywxDeptSyncOperation implements BaseSyncOperation {
         List<TabHaobanPreDealLog> preList = preDealService.listByPDataId(taskId, dataId,0);
         if (CollectionUtils.isNotEmpty(preList)) {
             Set<String> mid = preList.stream().map(tab -> tab.getDataId()).collect(Collectors.toSet());
-            dealDepartmentToMq(taskId, mid, SyncTaskStatusEnum.group_sync);
+            this.dealSyncOperationApiService.sendToMq(taskId,mid,SyncTaskStatusEnum.group_sync,"departmentSyncDealMq2");
         }
     }
 
     @Override
     public void checkDepartmentTask(String taskId) {
     }
-
-    /**
-     * 放入mq处理部门数据
-     * @param taskId
-     * @param dealList
-     */
-    private void dealDepartmentToMq(String taskId, Set<String> dealList, SyncTaskStatusEnum syncTaskStatusEnum) {
-        dealList.forEach(relationId -> {
-            DealParamMqDTO dealParamMqDTO = new DealParamMqDTO();
-            dealParamMqDTO.setTaskId(taskId);
-            dealParamMqDTO.setData(relationId);
-            dealParamMqDTO.setType(syncTaskStatusEnum.getVal());
-            GicMQClient clientInstance = GICMQClientUtil.getClientInstance();
-            try {
-                clientInstance.sendMessage("departmentSyncDealMq2", JSONObject.toJSONString(dealParamMqDTO));
-            } catch (Exception e) {
-                logger.info("发送失败:{},{}", taskId, relationId);
-                e.printStackTrace();
-            }
-        });
-    }
 }