同步通讯录 微信同步gic

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

@@ -201,6 +201,12 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
 
 
     private String createBaseTask(String wxEnterpriseId, String taskName, String userId, String desc, int taskType) {
+        String key = "sync_create_task_" + wxEnterpriseId;
+        RedisUtil.lock(key, 10L);
+        String taskLock = getTaskLock(wxEnterpriseId);
+        if (StringUtils.isNotBlank(taskLock)) {
+            return null;
+        }
         TabHaobanSyncTask tabHaobanSyncTask = new TabHaobanSyncTask();
         tabHaobanSyncTask.setAddUser(userId);
         tabHaobanSyncTask.setTaskName(taskName);
@@ -211,6 +217,7 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
         tabHaobanSyncTask.setTaskType(taskType);
         syncTaskService.createTask(tabHaobanSyncTask);
         lockTask(wxEnterpriseId, tabHaobanSyncTask.getTaskId());
+        RedisUtil.unlock(key);
         return tabHaobanSyncTask.getTaskId();
 
     }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/SyncDealContoller.java

@@ -65,6 +65,9 @@ public class SyncDealContoller extends WebBaseController {
             return resultResponse(HaoBanErrCode.ERR_10011);
         }
         task = dealSyncOperationApiService.createTask(wxEnterpriseId, "门店同步", login.getStaffDTO().getStaffId(), "部门同步");
+        if (task == null) {
+            return resultResponse(HaoBanErrCode.ERR_10011);
+        }
         dealSyncOperationApiService.dealDepartment(task, login.getWxEnterpriseId(), qo.getAddDepartment(), qo.getEditDepartment());
 
         return resultResponse(HaoBanErrCode.ERR_1, task);