同步通讯录 微信同步gic

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

@@ -48,6 +48,15 @@ public interface DealSyncOperationApiService {
     public String createTask(String wxEnterpriseId, String taskName, String userId, String desc);
 
     /**
+     * 创建任务
+     *
+     * @param taskName
+     * @param userId
+     * @param desc
+     */
+    public String createQywxTask(String wxEnterpriseId, String taskName, String userId, String desc);
+
+    /**
      * 关闭任务
      *
      * @param wxEnterpriseId

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

@@ -199,8 +199,8 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
         dealDepartmentToMq(taskId, midList, syncTaskStatusEnum);
     }
 
-    @Override
-    public String createTask(String wxEnterpriseId, String taskName, String userId, String desc) {
+
+    private String createBaseTask(String wxEnterpriseId, String taskName, String userId, String desc, int taskType) {
         TabHaobanSyncTask tabHaobanSyncTask = new TabHaobanSyncTask();
         tabHaobanSyncTask.setAddUser(userId);
         tabHaobanSyncTask.setTaskName(taskName);
@@ -208,12 +208,25 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
         tabHaobanSyncTask.setWxEnterpriseId(wxEnterpriseId);
         tabHaobanSyncTask.setStatusFlag(SyncTaskStatusEnum.init.getVal());
         tabHaobanSyncTask.setTaskId(ToolUtil.randomUUID());
+        tabHaobanSyncTask.setTaskType(taskType);
         syncTaskService.createTask(tabHaobanSyncTask);
         lockTask(wxEnterpriseId, tabHaobanSyncTask.getTaskId());
         return tabHaobanSyncTask.getTaskId();
 
     }
 
+    @Override
+    public String createTask(String wxEnterpriseId, String taskName, String userId, String desc) {
+        return createBaseTask(wxEnterpriseId, taskName, userId, desc, 0);
+
+    }
+
+    @Override
+    public String createQywxTask(String wxEnterpriseId, String taskName, String userId, String desc) {
+        return createBaseTask(wxEnterpriseId, taskName, userId, desc, 1);
+
+    }
+
 
     /**
      * 处理修改数据
@@ -470,7 +483,7 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
     @Override
     public void dealQywxDepartment(String taskId, String wxEnterpriseId) {
         WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseService.selectById(wxEnterpriseId);
-        List<com.gic.wechat.api.dto.qywx.DepartmentDTO> list = qywxDepartmentApiService.listSelfDepartment(wxEnterpriseDTO.getCorpid(), wxEnterpriseDTO.getContactSecret(), 9641);
+        List<com.gic.wechat.api.dto.qywx.DepartmentDTO> list = qywxDepartmentApiService.listSelfDepartment(wxEnterpriseDTO.getCorpid(), wxEnterpriseDTO.getContactSecret(), 5074);
         if (CollectionUtils.isEmpty(list)) {
             logger.info("没有数据同步");
             return;
@@ -489,7 +502,7 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
 
         preDealService.insert(dealLogList);
         HashSet<String> hashSet = new HashSet<>();
-        hashSet.add("9641");
+        hashSet.add("5074");
         dealDepartmentToMq(taskId, hashSet, SyncTaskStatusEnum.group_sync);
     }
 

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

@@ -97,8 +97,8 @@ public class GroupSyncOperation implements BaseSyncOperation {
         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.setChainId(pParentDepartment.getChainId() + Constant.ID_SEPARATOR + pParentDepartment.getDepartmentId());
+        department.setChainName(pParentDepartment.getChainName() + Constant.NAME_SEPARATOR + pParentDepartment.getDepartmentName());
         department.setIsStore(0);
         department.setLevel(pParentDepartment.getLevel() + 1);
         department.setRelatedId(dealParamMqDTO.getData());

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

@@ -102,8 +102,8 @@ public class StoreSyncOperation implements BaseSyncOperation {
         department.setParentDepartmentId(pParentDepartment.getDepartmentId());
         department.setWxEnterpriseId(pParentDepartment.getWxEnterpriseId());
         department.setDepartmentName(storeDTO.getStoreName());
-        department.setChainId(pParentDepartment.getChainId() + Constant.ID_SEPARATOR + dealParamMqDTO.getData());
-        department.setChainName(pParentDepartment.getChainName() + Constant.NAME_SEPARATOR + department.getDepartmentName());
+        department.setChainId(pParentDepartment.getChainId() + Constant.ID_SEPARATOR + pParentDepartment.getDepartmentId());
+        department.setChainName(pParentDepartment.getChainName() + Constant.NAME_SEPARATOR + pParentDepartment.getDepartmentName());
         department.setIsStore(1);
         department.setStoreCode(storeDTO.getStoreCode());
         department.setRelatedCode(storeDTO.getStoreCode());

haoban-manage3-service/src/main/resources/mapper/SyncTaskMapper.xml

@@ -27,10 +27,10 @@
     </delete>
     <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabHaobanSyncTask">
         insert into tab_haoban_sync_task (task_id,wx_enterprise_id, task_name, add_user,
-        task_desc, status_flag, create_time,
+        task_desc, status_flag, create_time,task_type,
         update_time)
         values (#{taskId,jdbcType=VARCHAR},#{wxEnterpriseId}, #{taskName,jdbcType=VARCHAR}, #{addUser,jdbcType=VARCHAR},
-        #{taskDesc,jdbcType=VARCHAR}, #{statusFlag,jdbcType=INTEGER}, now(),now())
+        #{taskDesc,jdbcType=VARCHAR}, #{statusFlag,jdbcType=INTEGER},#{taskType}, now(),now())
     </insert>
     <insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanSyncTask">
         insert into tab_haoban_sync_task