同步优化初步3-同步成员

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/DealSyncOperationApiService.java

@@ -33,6 +33,13 @@ public interface DealSyncOperationApiService {
     public void dealDepartment(String taskId, String wxEnterpriseId, List<SyncSingleDealDTO> addList, List<SyncSingleDealDTO> editList);
 
     /**
+     * 重新执行任务
+     *
+     * @param taskId
+     */
+    public void reDealDepartment(String taskId, int dataType);
+
+    /**
      * 创建任务
      *
      * @param taskName

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

@@ -123,6 +123,17 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
     }
 
     @Override
+    public void reDealDepartment(String taskId, int dataType) {
+        List<TabHaobanPreDealLog> list = preDealService.listByTaskId(taskId, dataType, PreDealStatusEnum.exception.getVal());
+
+        if (CollectionUtils.isEmpty(list)) {
+            return;
+        }
+        Set<String> midList = list.stream().map(TabHaobanPreDealLog::getDataId).collect(Collectors.toSet());
+        dealDepartmentToMq(taskId, midList, SyncTaskStatusEnum.clerk_sync);
+    }
+
+    @Override
     public String createTask(String taskName, String userId, String desc) {
         TabHaobanSyncTask tabHaobanSyncTask = new TabHaobanSyncTask();
         tabHaobanSyncTask.setAddUser(userId);

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

@@ -5,6 +5,7 @@ import com.gic.enterprise.api.service.EnterpriseService;
 import com.gic.enterprise.api.service.StoreGroupService;
 import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.common.utils.HaobanResponse;
+import com.gic.haoban.manage.api.enums.PreDealTypeEnum;
 import com.gic.haoban.manage.api.service.DealSyncOperationApiService;
 import com.gic.haoban.manage.api.service.DepartmentApiService;
 import com.gic.haoban.manage.api.service.StaffApiService;
@@ -76,5 +77,17 @@ public class SyncDealContoller extends WebBaseController {
 
     }
 
+    @RequestMapping("/clerk-re-sync")
+    @ResponseBody
+    public HaobanResponse clerkReSync(String taskId) {
+        String task = null;
+        if (StringUtils.isNotBlank(taskId)) {
+            dealSyncOperationApiService.reDealDepartment(taskId, PreDealTypeEnum.clerk.getVal());
+        }
+
+        return resultResponse(HaoBanErrCode.ERR_1, task);
+
+    }
+
 
 }