通讯录

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

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import com.gic.haoban.manage.api.service.DealSyncOperationApiService;
 import com.gic.wechat.api.service.qywx.QywxDepartmentApiService;
 import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
@@ -67,6 +68,8 @@ public class QywxDeptSyncOperation implements BaseSyncOperation {
     private Config config;
     @Autowired
     private QywxDepartmentApiService qywxDepartmentApiService;
+    @Autowired
+    private DealSyncOperationApiService dealSyncOperationApiService;
 
     @Override
     public void dealSingleByMq(DealParamMqDTO dealParamMqDTO, TabHaobanPreDealLog dataPre) {
@@ -127,6 +130,9 @@ public class QywxDeptSyncOperation implements BaseSyncOperation {
             } else {
                 this.departmentService.edit(dto);
             }
+            if("1".equals(dataId)) {
+                this.syncTaskService.updateTaskStatus(taskId, SyncTaskStatusEnum.compute.getVal());
+            }
             this.getStaff(taskId,dataId,enterpriseId,wxEnterpriseId,secretSetting,qwDTO);
         } catch (Exception e) {
             resultFlag = false;
@@ -162,6 +168,7 @@ public class QywxDeptSyncOperation implements BaseSyncOperation {
             }
             if (null == list) {
                 logger.info("微信获取部门成员异常：{},{}", taskId, dataId);
+                dealSyncOperationApiService.unlockTask(wxEnterpriseId) ;
                 return;
             }
             logger.info("拉取成员数={},taskId={}",list.size(),taskId);
@@ -206,7 +213,6 @@ public class QywxDeptSyncOperation implements BaseSyncOperation {
         String key = "haoban_sync_department_task_" + taskId;
         RedisUtil.lock(key, 3L);
         // 部门和成员拉取成功后,直接任务完成
-        syncTaskService.updateTaskStatus(taskId, SyncTaskStatusEnum.compute.getVal());
         List<TabHaobanPreDealLog> dealLogs = preDealService.listByTaskId(taskId, PreDealTypeEnum.clerk.getVal(), PreDealStatusEnum.pre.getVal());
         if (CollectionUtils.isEmpty(dealLogs)) {
             // 判断成员是否都已完成
@@ -225,8 +231,6 @@ public class QywxDeptSyncOperation implements BaseSyncOperation {
      * @param dealList
      */
     private void dealDepartmentToMq(String taskId, Set<String> dealList, SyncTaskStatusEnum syncTaskStatusEnum) {
-        //预处理分组任务
-        syncTaskService.updateTaskStatus(taskId, syncTaskStatusEnum.getVal());
         dealList.forEach(relationId -> {
             DealParamMqDTO dealParamMqDTO = new DealParamMqDTO();
             dealParamMqDTO.setTaskId(taskId);