同步优化初步

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/DealParamMqDTO.java

+package com.gic.haoban.manage.api.dto;
+
+import java.io.Serializable;
+
+/**
+ * Created 2020/4/10.
+ *
+ * @author hua
+ */
+public class DealParamMqDTO implements Serializable {
+    private String taskId;
+    private String data;
+    private Integer type;
+
+    public String getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(String taskId) {
+        this.taskId = taskId;
+    }
+
+    public String getData() {
+        return data;
+    }
+
+    public void setData(String data) {
+        this.data = data;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/SyncSingleDealDTO.java

+package com.gic.haoban.manage.api.dto;
+
+/**
+ * Created 2020/4/9.
+ *
+ * @author hua
+ */
+public class SyncSingleDealDTO {
+    private String departmentId;
+    private String departmentName;
+    private String parentDepartmentId;
+    private String relatedId;
+    private Integer storeFlag;
+    private String enterpriseId;
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getDepartmentId() {
+        return departmentId;
+    }
+
+    public void setDepartmentId(String departmentId) {
+        this.departmentId = departmentId;
+    }
+
+    public String getDepartmentName() {
+        return departmentName;
+    }
+
+    public void setDepartmentName(String departmentName) {
+        this.departmentName = departmentName;
+    }
+
+    public String getParentDepartmentId() {
+        return parentDepartmentId;
+    }
+
+    public void setParentDepartmentId(String parentDepartmentId) {
+        this.parentDepartmentId = parentDepartmentId;
+    }
+
+    public String getRelatedId() {
+        return relatedId;
+    }
+
+    public void setRelatedId(String relatedId) {
+        this.relatedId = relatedId;
+    }
+
+    public Integer getStoreFlag() {
+        return storeFlag;
+    }
+
+    public void setStoreFlag(Integer storeFlag) {
+        this.storeFlag = storeFlag;
+    }
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/PreDealStatusEnum.java

+package com.gic.haoban.manage.api.enums;
+
+/**
+ * Created by hua on 2020/4/10.
+ */
+public enum PreDealStatusEnum {
+    all(-1),
+    pre(0),
+    dealing(1),
+    computed(2),
+    exception(3);
+    private int val;
+
+    PreDealStatusEnum(int val) {
+        this.val = val;
+    }
+
+    public int getVal() {
+        return val;
+    }
+
+    public void setVal(int val) {
+        this.val = val;
+    }
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/PreDealTypeEnum.java

+package com.gic.haoban.manage.api.enums;
+
+/**
+ * Created by hua on 2020/4/10.
+ */
+public enum PreDealTypeEnum {
+    all(-1),
+    group(0),
+    store(1),
+    clerk(2);
+    private int val;
+
+    PreDealTypeEnum(int val) {
+        this.val = val;
+    }
+
+    public int getVal() {
+        return val;
+    }
+
+    public void setVal(int val) {
+        this.val = val;
+    }
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/SyncTaskStatusEnum.java

+package com.gic.haoban.manage.api.enums;
+
+/**
+ * Created by hua on 2020/4/10.
+ */
+public enum SyncTaskStatusEnum {
+    init(0),
+    group_sync(1),
+    store_sync(2),
+    clerk_sync(3),
+    compute(4);
+
+    private int val;
+
+    SyncTaskStatusEnum(int val) {
+        this.val = val;
+    }
+
+    public int getVal() {
+        return val;
+    }
+
+    public void setVal(int val) {
+        this.val = val;
+    }
+}

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

+package com.gic.haoban.manage.api.service;
+
+import com.gic.haoban.manage.api.dto.SyncSingleDealDTO;
+
+import java.util.List;
+
+/**
+ * Created 2020/4/9.
+ *
+ * @author hua
+ */
+public interface DealSyncOperationApiService {
+    /**
+     * 其它处理通过任务
+     *
+     * @param params
+     */
+    public void run(String params);
+
+    /**
+     * 部门同步处理
+     *
+     * @param params
+     */
+    public void departmentDealMq(String params);
+
+    /**
+     * 处理前端数据
+     *
+     * @param addList
+     * @param editList
+     */
+    public void dealDepartment(String taskId, String wxEnterpriseId, List<SyncSingleDealDTO> addList, List<SyncSingleDealDTO> editList);
+
+
+//    public void createTask()
+
+
+}

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

+package com.gic.haoban.manage.service.service;
+
+import com.gic.haoban.manage.service.entity.TabHaobanPreDealLog;
+
+import java.util.List;
+
+/**
+ * Created 2020/4/9.
+ *
+ * @author hua
+ */
+public interface PreDealService {
+    /**
+     * 批量新增
+     *
+     * @param list
+     * @return
+     */
+    public boolean insert(List<TabHaobanPreDealLog> list);
+
+    /**
+     * 获取单条数据
+     *
+     * @param dataId
+     * @return
+     */
+    public TabHaobanPreDealLog getByDataId(String taskId, String dataId, int status);
+
+    /**
+     * 根据父数据id 获取子节点
+     *
+     * @param pDataId
+     * @param status
+     * @return
+     */
+    public List<TabHaobanPreDealLog> listByPDataId(String taskId, String pDataId, int status);
+
+    /**
+     * 更新单条数据状态
+     *
+     * @param dataId
+     * @param status
+     * @return
+     */
+    public boolean updateStatusByDataId(String taskId, String dataId, int status);
+
+
+    /**
+     * 获取任务是否有在同步中
+     *
+     * @param dataType
+     * @return
+     */
+    public boolean checkTask(String taskId, int dataType);
+
+    /**
+     * 获取任务列表
+     *
+     * @param type
+     * @param status
+     * @return
+     */
+    public List<TabHaobanPreDealLog> listByTaskId(String taskId, int dataType, int status);
+}

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

+package com.gic.haoban.manage.service.service;
+
+import com.gic.haoban.manage.service.entity.TabHaobanSyncTask;
+
+/**
+ * Created 2020/4/10.
+ *
+ * @author hua
+ */
+public interface SyncTaskService {
+
+    /**
+     * 创建任务
+     *
+     * @param tabHaobanSyncTask
+     */
+    public void createTask(TabHaobanSyncTask tabHaobanSyncTask);
+
+    /**
+     * 更新任务状态
+     *
+     * @param taskId
+     * @param status
+     */
+    public boolean updateTaskStatus(String taskId, int status);
+
+    /**
+     * 获取任务
+     *
+     * @param taskId
+     * @return
+     */
+    public TabHaobanSyncTask getSyncTask(String taskId);
+}

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

+package com.gic.haoban.manage.service.service.impl;
+
+import com.gic.haoban.manage.api.enums.PreDealStatusEnum;
+import com.gic.haoban.manage.service.dao.mapper.PreDealLogMapper;
+import com.gic.haoban.manage.service.entity.TabHaobanPreDealLog;
+import com.gic.haoban.manage.service.service.PreDealService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Created 2020/4/9.
+ *
+ * @author hua
+ */
+@Service
+public class PreDealServiceImpl implements PreDealService {
+
+    @Autowired
+    private PreDealLogMapper preDealLogMapper;
+
+    @Override
+    public boolean insert(List<TabHaobanPreDealLog> list) {
+        for (TabHaobanPreDealLog tab : list) {
+            preDealLogMapper.insert(tab);
+        }
+        return true;
+    }
+
+    @Override
+    public TabHaobanPreDealLog getByDataId(String taskId, String dataId, int status) {
+        TabHaobanPreDealLog byDataId = preDealLogMapper.getByDataId(taskId, dataId, status);
+        return byDataId;
+    }
+
+    @Override
+    public List<TabHaobanPreDealLog> listByPDataId(String taskId, String pDataId, int status) {
+        return preDealLogMapper.listByPDataId(taskId, pDataId, status);
+    }
+
+    @Override
+    public boolean updateStatusByDataId(String taskId, String dataId, int status) {
+        int i = preDealLogMapper.updateStatusByDataId(taskId, dataId, status);
+        return i >= 0;
+    }
+
+    @Override
+    public boolean checkTask(String taskId, int dataType) {
+        int i = preDealLogMapper.checkTask(taskId, dataType, PreDealStatusEnum.pre.getVal());
+        return i == 0;
+    }
+
+    @Override
+    public List<TabHaobanPreDealLog> listByTaskId(String taskId, int dataType, int status) {
+        return preDealLogMapper.listByTaskId(taskId, dataType, status);
+    }
+}

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

+package com.gic.haoban.manage.service.service.impl;
+
+import com.gic.commons.util.ToolUtil;
+import com.gic.haoban.manage.api.enums.SyncTaskStatusEnum;
+import com.gic.haoban.manage.service.dao.mapper.SyncTaskMapper;
+import com.gic.haoban.manage.service.entity.TabHaobanSyncTask;
+import com.gic.haoban.manage.service.service.SyncTaskService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * Created 2020/4/10.
+ *
+ * @author hua
+ */
+@Service
+public class SyncTaskServiceImpl implements SyncTaskService {
+
+    @Autowired
+    private SyncTaskMapper syncTaskMapper;
+
+
+    @Override
+    public void createTask(TabHaobanSyncTask tabHaobanSyncTask) {
+        tabHaobanSyncTask.setTaskId(ToolUtil.randomUUID());
+        tabHaobanSyncTask.setStatusFlag(SyncTaskStatusEnum.init.getVal());
+        syncTaskMapper.insert(tabHaobanSyncTask);
+    }
+
+    @Override
+    public boolean updateTaskStatus(String taskId, int status) {
+        return false;
+    }
+
+    @Override
+    public TabHaobanSyncTask getSyncTask(String taskId) {
+        return syncTaskMapper.selectByPrimaryKey(taskId);
+    }
+}

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

+package com.gic.haoban.manage.service.service.out.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.gic.commons.util.GICMQClientUtil;
+import com.gic.enterprise.api.dto.StoreDTO;
+import com.gic.enterprise.api.dto.StoreGroupDTO;
+import com.gic.enterprise.api.service.StoreGroupService;
+import com.gic.enterprise.api.service.StoreService;
+import com.gic.haoban.base.api.common.Constant;
+import com.gic.haoban.base.api.common.ServiceResponse;
+import com.gic.haoban.common.utils.EntityUtil;
+import com.gic.haoban.manage.api.dto.DealParamMqDTO;
+import com.gic.haoban.manage.api.dto.DepartmentDTO;
+import com.gic.haoban.manage.api.dto.SyncSingleDealDTO;
+import com.gic.haoban.manage.api.enums.PreDealStatusEnum;
+import com.gic.haoban.manage.api.enums.PreDealTypeEnum;
+import com.gic.haoban.manage.api.enums.SyncTaskStatusEnum;
+import com.gic.haoban.manage.api.service.DealSyncOperationApiService;
+import com.gic.haoban.manage.api.service.DepartmentApiService;
+import com.gic.haoban.manage.service.entity.TabHaobanDepartment;
+import com.gic.haoban.manage.service.entity.TabHaobanPreDealLog;
+import com.gic.haoban.manage.service.entity.TabHaobanSyncTask;
+import com.gic.haoban.manage.service.service.DepartmentService;
+import com.gic.haoban.manage.service.service.PreDealService;
+import com.gic.haoban.manage.service.service.SyncTaskService;
+import com.gic.mq.sdk.GicMQClient;
+import com.gic.redis.data.util.RedisUtil;
+import com.task.allocation.api.AbstractTaskAllocationNewOperation;
+import com.task.allocation.exception.TaskAllocationException;
+import com.task.allocation.qo.TaskAllocationComputed;
+import org.apache.commons.collections.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * Created 2020/4/9.
+ *
+ * @author hua
+ */
+@Service
+public class DealSyncOperationApiServiceImpl extends AbstractTaskAllocationNewOperation implements DealSyncOperationApiService {
+
+    private static final Logger logger = LoggerFactory.getLogger(DealSyncOperationApiServiceImpl.class);
+
+    @Autowired
+    private DepartmentService departmentService;
+
+    @Autowired
+    private StoreGroupService storeGroupService;
+
+    @Autowired
+    private PreDealService preDealService;
+
+    @Autowired
+    private DepartmentApiService departmentApiService;
+
+    @Autowired
+    private SyncTaskService syncTaskService;
+
+    @Autowired
+    private StoreService storeService;
+
+    @Override
+    public void departmentDealMq(String params) {
+        logger.info("mq处理中:{}", params);
+        DealParamMqDTO dealParamMqDTO = JSONObject.parseObject(params, DealParamMqDTO.class);
+        TabHaobanPreDealLog dataPre = preDealService.getByDataId(dealParamMqDTO.getTaskId()
+                , dealParamMqDTO.getData(), PreDealStatusEnum.all.getVal());
+
+        if (dataPre == null) {
+            logger.info("待处理数据不存在:{}", params);
+            return;
+        }
+        //部门处理
+        if (dataPre.getDataType().equals(PreDealTypeEnum.group.getVal())) {
+            DepartmentDTO departmentDTO = departmentApiService.selectById(dataPre.getDataId());
+            if (departmentDTO != null) {
+                logger.info("已经同步过了:{}", dataPre.getDataId());
+                dealExceptionDepartmenr(dealParamMqDTO.getTaskId(), dealParamMqDTO.getData(), dataPre.getEnterpriseId(), "该部门不存在");
+                return;
+            }
+
+            TabHaobanDepartment pParentDepartment = departmentService.selectById(dataPre.getpDataId());
+            if (null == pParentDepartment) {
+                logger.info("不存在该父部门：c:{},p:{}", dataPre.getDataId(), dataPre.getpDataId());
+                return;
+            }
+            StoreGroupDTO groupDTO = storeGroupService.getStoreGroupById(dealParamMqDTO.getData());
+            if (null == groupDTO) {
+                logger.info("该部门不存在");
+                dealExceptionDepartmenr(dealParamMqDTO.getTaskId(), dealParamMqDTO.getData(), dataPre.getEnterpriseId(), "该部门不存在");
+                return;
+            }
+            DepartmentDTO department = new DepartmentDTO();
+            department.setParentDepartmentId(pParentDepartment.getDepartmentId());
+            department.setWxEnterpriseId(pParentDepartment.getWxEnterpriseId());
+            department.setDepartmentName(groupDTO.getStoreGroupName());
+            department.setChainId(pParentDepartment.getChainId() + Constant.ID_SEPARATOR + dealParamMqDTO.getData());
+            department.setChainName(pParentDepartment.getChainName() + Constant.NAME_SEPARATOR + department.getDepartmentName());
+            department.setIsStore(0);
+            department.setLevel(pParentDepartment.getLevel() + 1);
+            department.setRelatedId(dealParamMqDTO.getData());
+            department.setSort(groupDTO.getStoreGroupSort());
+            //状态 处理状态
+            boolean resultFlag = true;
+
+            try {
+                ServiceResponse add = departmentApiService.add(department);
+                if (add.getCode() != 1) {
+                    resultFlag = false;
+                    logger.info("处理失败");
+                    return;
+                }
+            } catch (Exception e) {
+                resultFlag = false;
+                e.printStackTrace();
+                logger.info("处理异常");
+            } finally {
+                if (!resultFlag) {
+                    dealExceptionDepartmenr(dealParamMqDTO.getTaskId(), dealParamMqDTO.getData(), dataPre.getEnterpriseId(), "处理异常或失败");
+                } else {
+                    dealSuccessDepartmenr(dealParamMqDTO.getTaskId(), dealParamMqDTO.getData(), dataPre.getWxEnterpriseId());
+
+                }
+            }
+        }
+
+    }
+
+    /**
+     * 校验部门同步任务成功与否
+     *
+     * @param taskId
+     */
+    private void checkDepartmentTask(String taskId) {
+        boolean b = preDealService.checkTask(taskId, PreDealTypeEnum.group.getVal());
+        if (!b) {
+            return;
+        }
+        logger.info("部门继续成功，开始门店同步:{}", taskId);
+        String key = "haoban_sync_department_task_" + taskId;
+        RedisUtil.lock(key, 3L);
+        TabHaobanSyncTask syncTask = syncTaskService.getSyncTask(taskId);
+        //同步成功 进入门店处理
+        if (syncTask.getStatusFlag().equals(SyncTaskStatusEnum.init.getVal())) {
+            syncTaskService.updateTaskStatus(taskId, SyncTaskStatusEnum.store_sync.getVal());
+            List<TabHaobanPreDealLog> dealLogs = preDealService.listByTaskId(taskId, PreDealTypeEnum.store.getVal(), PreDealStatusEnum.pre.getVal());
+            if (CollectionUtils.isEmpty(dealLogs)) {
+                syncTaskService.updateTaskStatus(taskId, SyncTaskStatusEnum.compute.getVal());
+            } else {
+                logger.info("处理门店开始");
+                Set<String> dataIds = dealLogs.stream().map(TabHaobanPreDealLog::getDataId).collect(Collectors.toSet());
+                dealDepartmentToMq(taskId, dataIds, SyncTaskStatusEnum.store_sync);
+            }
+        }
+        RedisUtil.unlock(key);
+
+    }
+
+    /**
+     * 部门异常处理
+     *
+     * @param dataId
+     * @param reason
+     */
+    private void dealExceptionDepartmenr(String taskId, String dataId, String enterpriseId, String reason) {
+        List<String> ids = storeGroupService.getStoreGroupIdsByParentId(enterpriseId, dataId);
+        if (CollectionUtils.isEmpty(ids)) {
+            logger.info("下面层级不存在");
+            //todo 是否需要加锁判断
+            return;
+        }
+        //todo 需要优化 测试
+        for (String id : ids) {
+            preDealService.updateStatusByDataId(taskId, id, PreDealStatusEnum.exception.getVal());
+        }
+        checkDepartmentTask(taskId);
+    }
+
+    /**
+     * 部门异常处理
+     *
+     * @param dataId
+     */
+    private void dealSuccessDepartmenr(String taskId, String dataId, String wxEnterpriseId) {
+        boolean b = preDealService.updateStatusByDataId(taskId, dataId, PreDealStatusEnum.computed.getVal());
+        if (!b) {
+            logger.info("成功修改错误！{}", dataId);
+            return;
+        }
+        List<StoreDTO> storeDTOS = storeService.listStoreByStoreGroupId(dataId);
+        //预处理门店 写入预处理表
+        if (CollectionUtils.isNotEmpty(storeDTOS)) {
+            List<TabHaobanPreDealLog> preDealLogList = storeDTOS.stream().map(storeDTO -> {
+                TabHaobanPreDealLog dealLog = new TabHaobanPreDealLog();
+                dealLog.setDataId(storeDTO.getStoreId());
+                dealLog.setpDataId(dataId);
+                dealLog.setDataType(PreDealTypeEnum.store.getVal());
+                dealLog.setStatusFlag(0);
+                dealLog.setTaskId(taskId);
+                dealLog.setEnterpriseId(storeDTO.getEnterpriseId());
+                dealLog.setWxEnterpriseId(wxEnterpriseId);
+                return dealLog;
+            }).collect(Collectors.toList());
+            preDealService.insert(preDealLogList);
+        }
+        List<TabHaobanPreDealLog> list = preDealService.listByPDataId(taskId, dataId, PreDealStatusEnum.pre.getVal());
+        if (CollectionUtils.isNotEmpty(list)) {
+            Set<String> mid = list.stream().map(tab -> tab.getDataId()).collect(Collectors.toSet());
+            dealDepartmentToMq(taskId, mid, SyncTaskStatusEnum.group_sync);
+        } else {
+            checkDepartmentTask(taskId);
+        }
+    }
+
+    @Override
+    public void dealDepartment(String taskId, String wxEnterpriseId
+            , List<SyncSingleDealDTO> addList, List<SyncSingleDealDTO> editList) {
+
+        logger.info("初始开始:{}", taskId);
+        //处理修改
+        dealEidtSync(editList);
+
+        if (CollectionUtils.isEmpty(addList)) {
+            return;
+        }
+        logger.info("处理分组信息开始：{}", taskId);
+        dealAddSync(taskId, wxEnterpriseId, editList);
+
+        //加入队列处理
+        logger.info("初始化到队列：{}", taskId);
+        dealDepartmentInit(taskId, wxEnterpriseId, addList);
+
+    }
+
+    /**
+     * 处理修改数据
+     *
+     * @param editList
+     */
+    private void dealEidtSync(List<SyncSingleDealDTO> editList) {
+        if (CollectionUtils.isEmpty(editList)) {
+            return;
+        }
+        //先处理修改的
+        editList.forEach(syncSingleDealDTO -> {
+            // TODO: 2020/4/9  需要优化
+            TabHaobanDepartment department = departmentService.selectById(syncSingleDealDTO.getDepartmentId());
+            department.setParentDepartmentId(syncSingleDealDTO.getParentDepartmentId());
+            departmentApiService.edit(EntityUtil.changeEntityByJSON(DepartmentDTO.class, department));
+        });
+    }
+
+    /**
+     * 执行新增同步
+     *
+     * @param taskId
+     * @param wxEnterpriseId
+     * @param addList
+     */
+    private void dealAddSync(String taskId, String wxEnterpriseId, List<SyncSingleDealDTO> addList) {
+        //获取企业与分组map
+        Map<String, List<String>> eidListMap = addList.stream().filter(dto -> {
+            String departmentId = dto.getDepartmentId();
+            TabHaobanDepartment department = departmentService.selectById(departmentId);
+            if (department != null) {
+                return false;
+            }
+            Integer storeFlag = dto.getStoreFlag();
+            if (storeFlag.equals(1)) {
+                return false;
+            }
+            return true;
+        }).collect(Collectors.groupingBy(SyncSingleDealDTO::getEnterpriseId
+                , Collectors.mapping(SyncSingleDealDTO::getRelatedId, Collectors.toList())));
+
+        //放入预处理表
+        eidListMap.forEach((k, v) -> {
+            //获取所有分组列表
+            List<StoreGroupDTO> groupDTOList = storeGroupService.listStoreGroupAndChildren(v.toArray(new String[]{}), k);
+            List<TabHaobanPreDealLog> dealList = groupDTOList.stream().map(storeGroupDTO -> {
+                TabHaobanPreDealLog dealLog = new TabHaobanPreDealLog();
+                dealLog.setDataId(storeGroupDTO.getStoreGroupId());
+                dealLog.setpDataId(storeGroupDTO.getParentGroupId());
+                dealLog.setDataType(PreDealTypeEnum.group.getVal());
+                dealLog.setStatusFlag(0);
+                dealLog.setTaskId(taskId);
+                dealLog.setEnterpriseId(storeGroupDTO.getEnterpriseId());
+                dealLog.setWxEnterpriseId(wxEnterpriseId);
+                return dealLog;
+            }).collect(Collectors.toList());
+
+            preDealService.insert(dealList);
+        });
+
+        //处理门店信息
+        List<TabHaobanPreDealLog> storeList = addList.stream().filter(dto -> {
+            return dto.getStoreFlag() == 1;
+        }).map(dto -> {
+            TabHaobanPreDealLog dealLog = new TabHaobanPreDealLog();
+            dealLog.setDataId(dto.getRelatedId());
+            dealLog.setpDataId(dto.getParentDepartmentId());
+            dealLog.setDataType(1);
+            dealLog.setStatusFlag(0);
+            dealLog.setTaskId(taskId);
+            dealLog.setWxEnterpriseId(wxEnterpriseId);
+            return dealLog;
+        }).collect(Collectors.toList());
+
+        preDealService.insert(storeList);
+    }
+
+    /**
+     * 初始化部门
+     *
+     * @param taskId
+     * @param wxEnterpriseId
+     * @param addList
+     */
+    private void dealDepartmentInit(String taskId, String wxEnterpriseId, List<SyncSingleDealDTO> addList) {
+        Set<String> addListMid = addList.stream().map(dto -> dto.getRelatedId()).collect(Collectors.toSet());
+        dealDepartmentToMq(taskId, addListMid, SyncTaskStatusEnum.group_sync);
+    }
+
+    /**
+     * 放入mq处理部门数据
+     *
+     * @param taskId
+     * @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);
+            dealParamMqDTO.setData(relationId);
+            dealParamMqDTO.setType(syncTaskStatusEnum.getVal());
+            GicMQClient clientInstance = GICMQClientUtil.getClientInstance();
+            try {
+                clientInstance.sendMessage("departmentSyncDealMq", JSONObject.toJSONString(dealParamMqDTO));
+            } catch (Exception e) {
+                logger.info("发送失败:{},{}", taskId, relationId);
+                e.printStackTrace();
+            }
+        });
+    }
+
+    @Override
+    public List getListTasks(String params) {
+        return null;
+    }
+
+    @Override
+    public void dealSingle(Object obj) throws TaskAllocationException {
+
+    }
+
+    @Override
+    public void computed(TaskAllocationComputed computed) {
+
+    }
+
+    @Override
+    public Object singleClass() {
+        return null;
+    }
+}

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

+package com.gic.haoban.manage.service.task;
+
+/**
+ * Created 2020/4/13.
+ *
+ * @author hua
+ */
+public abstract class BaseSyncOperation {
+
+
+}

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

+package com.gic.haoban.manage.service.task;
+
+/**
+ * Created 2020/4/13.
+ *
+ * @author hua
+ */
+public class GroupSyncOperation extends BaseSyncOperation {
+}

haoban-manage3-service/src/test/java/DealSyncTest.java

+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.gic.api.base.commons.JSONResponse;
+import com.gic.haoban.manage.api.dto.SyncSingleDealDTO;
+import com.gic.haoban.manage.api.service.DealSyncOperationApiService;
+import com.gic.haoban.manage.api.service.DepartmentApiService;
+import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
+import com.gic.wechat.api.dto.qywx.DepartmentDTO;
+import com.gic.wechat.api.dto.qywx.QywxXcxSendMessageDTO;
+import com.gic.wechat.api.dto.qywx.UserDTO;
+import com.gic.wechat.api.service.qywx.QywxDepartmentApiService;
+import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
+import com.gic.wechat.api.service.qywx.QywxUserApiService;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = {"classpath:applicationContext-conf.xml"})
+public class DealSyncTest {
+
+    @Autowired
+    private DealSyncOperationApiService dealSyncOperationApiService;
+
+    @Test
+    public void test() {
+        List<SyncSingleDealDTO> add = new ArrayList<>();
+        List<SyncSingleDealDTO> edit = new ArrayList<>();
+
+        {
+            SyncSingleDealDTO dealDTO = new SyncSingleDealDTO();
+            dealDTO.setDepartmentId("ff80808166c3a1050166c43175d9000e");
+            dealDTO.setParentDepartmentId("a101b3a51cd549e79f3daec1aa628301");
+            dealDTO.setDepartmentName("西溪花园");
+            dealDTO.setRelatedId("ff80808166c3a1050166c43175d9000e");
+            dealDTO.setStoreFlag(0);
+            dealDTO.setEnterpriseId("ff8080815dacd3a2015dacd3ef5c0000");
+            add.add(dealDTO);
+        }
+
+        {
+            SyncSingleDealDTO dealDTO = new SyncSingleDealDTO();
+            dealDTO.setDepartmentId("100333808083");
+            dealDTO.setParentDepartmentId("a101b3a51cd549e79f3daec1aa628301");
+            dealDTO.setDepartmentName("测试门店1003338");
+            dealDTO.setRelatedId("100333808083");
+            dealDTO.setStoreFlag(1);
+            dealDTO.setEnterpriseId("ff8080815dacd3a2015dacd3ef5c0000");
+            add.add(dealDTO);
+        }
+        dealSyncOperationApiService.dealDepartment("111", "ca66a01b79474c40b3e7c7f93daf1a3b", add, edit);
+    }
+
+
+}

haoban-manage3-service/src/test/java/ServiceTest.java

-//import com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService;
-//import com.gic.wechat.api.service.qywx.QywxUserApiService;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.gic.api.base.commons.JSONResponse;
+import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
+import com.gic.wechat.api.dto.qywx.DepartmentDTO;
+import com.gic.wechat.api.dto.qywx.QywxXcxSendMessageDTO;
+import com.gic.wechat.api.dto.qywx.UserDTO;
+import com.gic.wechat.api.service.qywx.QywxDepartmentApiService;
+import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
+import com.gic.wechat.api.service.qywx.QywxUserApiService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-//import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-//import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
-import com.gic.redis.data.util.RedisUtil;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:applicationContext-conf.xml"})
 public class ServiceTest {
-//	@Autowired
-//	private WxEnterpriseRelatedApiService wxEnterpriseRelatedApiService;
+    @Autowired
+    private WxEnterpriseRelatedApiService wxEnterpriseRelatedApiService;
 
-//	@Autowired
-//	private QywxUserApiService qywxUserApiService;
+    @Autowired
+    private QywxUserApiService qywxUserApiService;
+
+    @Autowired
+    private QywxDepartmentApiService qywxDepartmentApiService;
+
+    @Autowired
+    private QywxSuiteApiService qywxSuiteApiService;
 
 	@Test
 	public void test() {
 		//wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId("073e89a37eb14acabf258e59a57359b6");
-		RedisUtil.delCache("haoban-sync-department-ca66a01b79474c40b3e7c7f93daf1a3b");
 	}
 
 
-//	@Test
-//	public void test1() {
-//		String corpSelfExternalUseridInfo = qywxUserApiService.getCorpSelfExternalUseridInfo("ww50d418adce14b4a9"
-//				, "1azg6LG5Vj_YKFO-X27to4S4x_y-f6APR0fwE9YnQd8", "wm-0J8CQAAbGIhtnLd51B97OO_0gf3zw");
-//		System.out.println(corpSelfExternalUseridInfo);
+    @Test
+    public void test1() {
+        String res = qywxUserApiService.leaveClerkExternal("ww9ede832a84b7ae5f"
+                , "01YQ-pcdYzF3K0So8uCFfkB5i8D5EBW7KcVB4qA8Ktk", 0, 1000);
+        JSONArray jsonArray = JSONArray.parseArray(res);
+        jsonArray.forEach(o -> {
+            JSONObject mid = (JSONObject) o;
+            qywxUserApiService.leaveClerkReTransfer("ww9ede832a84b7ae5f"
+                    , "01YQ-pcdYzF3K0So8uCFfkB5i8D5EBW7KcVB4qA8Ktk", mid.getString("handover_userid")
+                    , mid.getString("handover_userid"), mid.getString("external_userid"));
+        });
+        System.out.println(res);
+    }
+
+    @Test
+    public void test2() {
+        UserDTO userDTO = new UserDTO();
+        userDTO.setUserid("niweizhong");
+        userDTO.setName("空闻大师");
+        userDTO.setDepartment(new Integer[]{4});
+        userDTO.setMobile("17605628855");
+        userDTO.setCorpid("ww9ede832a84b7ae5f");
+        JSONResponse workWxUser = qywxUserApiService.createWorkWxUser(userDTO, "ww9ede832a84b7ae5f", "ww7d6566614055cf27");
+        System.out.println(JSONObject.toJSONString(workWxUser));
+    }
+
+    @Test
+    public void list() {
+
+        List<DepartmentDTO> list = qywxDepartmentApiService.listSelfDepartment("ww9ede832a84b7ae5f"
+                , "3aOw7jbcHlHkDmOi5TuG42Ta8NqskOhZxy5urrmaGl8", 1);
+        Iterator<DepartmentDTO> iterator = list.iterator();
+//		while (iterator.hasNext()) {
+//			DepartmentDTO next = iterator.next();
+//			if(!next.getParentid().equals("1")) {
+//				iterator.remove();
 //			}
+//		}
+        System.out.println(JSONObject.toJSONString(list));
+    }
+
+    @Test
+    public void addDepart() {
+        DepartmentDTO dto = new DepartmentDTO();
+//		dto.set
+//		JSONResponse department = qywxDepartmentApiService.createDepartment("ww9ede832a84b7ae5f"
+//				, "ww7d6566614055cf27", null);
+//		List<DepartmentDTO> list = (List<DepartmentDTO>) department;
+//		System.out.println(JSONObject.toJSONString(list));
+    }
+
+    @Test
+    public void getUser() {
+        DepartmentDTO dto = new DepartmentDTO();
+//		dto.set
+        UserDTO phonenumber = qywxUserApiService.getWxUserByPhonenumber("ww9ede832a84b7ae5f"
+                , "ww7d6566614055cf27", "13735457631");
+//		String phonenumber = phonenumber;
+//		UserDTO phonenumber = (UserDTO) useridBymobile;
+        System.out.println(JSONObject.toJSONString(phonenumber));
+    }
+
+    @Test
+    public void createSelfUser() {
+        UserDTO userDTO = new UserDTO();
+        userDTO.setUserid("niweizhong2");
+        userDTO.setName("空闻大师2");
+        userDTO.setDepartment(new Integer[]{5072});
+        userDTO.setMobile("17605628851");
+        userDTO.setCorpid("ww9ede832a84b7ae5f");
+        JSONResponse workWxUser = qywxUserApiService.createSelfWorkWxUser(userDTO, "ww9ede832a84b7ae5f",
+                "3aOw7jbcHlHkDmOi5TuG42Ta8NqskOhZxy5urrmaGl8");
+        System.out.println(JSONObject.toJSONString(workWxUser));
+    }
+
+
+    @Test
+    public void sendMessage() {
+        QywxXcxSendMessageDTO messageDTO = new QywxXcxSendMessageDTO();
+        messageDTO.setAppid("wx6054e7be35015afc");
+        ArrayList<String> userIDs = new ArrayList<>();
+        userIDs.add("9ae4c4f1277340a186b16a17d937c72c");
+        messageDTO.setUserIds(userIDs);
+        messageDTO.setTitle("我的测试test");
+        messageDTO.setDescription("我的测试test11111");
+        boolean ret = qywxSuiteApiService.sendMessage("ww9ede832a84b7ae5f",
+                "ww2c34dc56739bb105", messageDTO);
+        System.out.println(JSONObject.toJSONString(ret));
+    }
 
 }

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

+package com.gic.haoban.manage.web.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.gic.api.base.commons.Page;
+import com.gic.clerk.api.dto.ClerkDTO;
+import com.gic.clerk.api.dto.ClerkListDTO;
+import com.gic.clerk.api.service.ClerkService;
+import com.gic.enterprise.api.dto.EnterpriseDTO;
+import com.gic.enterprise.api.dto.GicTreeDTO;
+import com.gic.enterprise.api.dto.StoreDTO;
+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.base.api.common.BasePageInfo;
+import com.gic.haoban.base.api.common.Constant;
+import com.gic.haoban.base.api.common.PageResult;
+import com.gic.haoban.base.api.common.ServiceResponse;
+import com.gic.haoban.common.utils.EntityUtil;
+import com.gic.haoban.common.utils.HaobanResponse;
+import com.gic.haoban.manage.api.dto.DepartmentDTO;
+import com.gic.haoban.manage.api.dto.StaffDTO;
+import com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO;
+import com.gic.haoban.manage.api.service.DepartmentApiService;
+import com.gic.haoban.manage.api.service.StaffApiService;
+import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
+import com.gic.haoban.manage.web.auth.AuthRequestUtil;
+import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
+import com.gic.haoban.manage.web.qo.DepartmentAddQO;
+import com.gic.haoban.manage.web.qo.DepartmentEditQO;
+import com.gic.haoban.manage.web.qo.SyncDealQO;
+import com.gic.haoban.manage.web.qo.SyncDepartmentQO;
+import com.gic.haoban.manage.web.thread.SyncDepartmentThread;
+import com.gic.haoban.manage.web.vo.DepartmentVO;
+import com.gic.haoban.manage.web.vo.LoginVO;
+import com.gic.redis.data.util.RedisUtil;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.*;
+
+@RestController
+public class SyncDealContoller extends WebBaseController {
+
+    private static Logger logger = LoggerFactory.getLogger(SyncDealContoller.class);
+    @Autowired
+    private DepartmentApiService departmentApiService;
+
+    @Autowired
+    private StoreGroupService storeGroupService;
+    @Autowired
+    private StoreService storeService;
+    @Autowired
+    private StaffApiService staffApiService;
+
+    @Autowired
+    private EnterpriseService enterpriseService;
+    @Autowired
+    private ClerkService clerkService;
+
+    @Autowired
+    private StaffDepartmentRelatedApiService staffDepartmentRelatedApiService;
+
+
+    @RequestMapping("department-sync")
+    @ResponseBody
+    public HaobanResponse departmentBatchSync(@RequestBody SyncDealQO qo) {
+        LoginVO login = (LoginVO) AuthRequestUtil.getSessionUser();
+        String wxEnterpriseId = login.getWxEnterpriseId();
+        String key = "haoban-sync-department-" + wxEnterpriseId;
+        if (RedisUtil.getCache(key) != null) {
+            return resultResponse(HaoBanErrCode.ERR_10011);
+        }
+        Object editDepartmentObject = null;
+        Object addDepartmentObject = null;
+        String editDepartment = "";
+        String addDepartment = "";
+        String delDepartmentIds = "";
+        logger.info("【部门同步】args={}", JSON.toJSONString(args));
+        if (args != null) {
+            editDepartmentObject = args.getEditDepartment();
+            addDepartmentObject = args.getAddDepartment();
+            editDepartment = JSON.toJSONString(editDepartmentObject);
+            addDepartment = JSON.toJSONString(addDepartmentObject);
+        }
+        RedisUtil.setCache(key, 1, 3600l);
+        new SyncDepartmentThread(this, editDepartment, delDepartmentIds, addDepartment, key).start();
+
+        return resultResponse(HaoBanErrCode.ERR_1, key);
+
+    }
+
+    @RequestMapping("department-batch-sync-success")
+    public HaobanResponse syncSuccess(String syncKey) {
+        if (RedisUtil.getCache(syncKey) == null) {
+            return resultResponse(HaoBanErrCode.ERR_1, true);
+        } else {
+            return resultResponse(HaoBanErrCode.ERR_1, false);
+        }
+    }
+
+
+}

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/SyncDealQO.java

+package com.gic.haoban.manage.web.qo;
+
+import com.gic.haoban.manage.api.dto.SyncSingleDealDTO;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class SyncDealQO implements Serializable {
+
+    private List<SyncSingleDealDTO> editDepartment;
+
+    private List<SyncSingleDealDTO> addDepartment;
+
+    public List<SyncSingleDealDTO> getEditDepartment() {
+        return editDepartment;
+    }
+
+    public void setEditDepartment(List<SyncSingleDealDTO> editDepartment) {
+        this.editDepartment = editDepartment;
+    }
+
+    public List<SyncSingleDealDTO> getAddDepartment() {
+        return addDepartment;
+    }
+
+    public void setAddDepartment(List<SyncSingleDealDTO> addDepartment) {
+        this.addDepartment = addDepartment;
+    }
+}