Skip to content

H
haoban-manage3.0
Commit 8692b85e by 墨竹
Options

fix：删除无效代码，优化代码

parent 39eab10b
Showing with 33 additions and 125 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/PreDealTypeEnum.java
......@@ -5,7 +5,7 @@ package com.gic.haoban.manage.api.enums;
*/
public enum PreDealTypeEnum {
all(-1, "全部"),
group(0, "分组"),
dept(0, "部门"),
store(1, "门店"),
clerk(2, "成员"),
friend_clerk(6, "导购"),
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/PreDealServiceImpl.java
......@@ -70,12 +70,12 @@ public class PreDealServiceImpl implements PreDealService {
@Override
public List<TabHaobanPreDealLog> listByPDataId(String taskId, String pDataId, int status) {
return preDealLogMapper.listByPDataId(taskId, pDataId, status, PreDealTypeEnum.group.getVal());
return preDealLogMapper.listByPDataId(taskId, pDataId, status, PreDealTypeEnum.dept.getVal());
}
@Override
public List<TabHaobanPreDealLog> listReByPDataId(String taskId, String pDataId) {
return preDealLogMapper.listReByPDataId(taskId, pDataId, PreDealTypeEnum.group.getVal());
return preDealLogMapper.listReByPDataId(taskId, pDataId, PreDealTypeEnum.dept.getVal());
}
@Override
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DealSyncOperationApiServiceImpl.java
......@@ -15,7 +15,6 @@ import com.gic.haoban.common.utils.EntityUtil;
import com.gic.haoban.manage.api.dto.*;
import com.gic.haoban.manage.api.enums.*;
import com.gic.haoban.manage.api.service.DealSyncOperationApiService;
import com.gic.haoban.manage.api.service.DepartmentApiService;
import com.gic.haoban.manage.service.entity.*;
import com.gic.haoban.manage.service.service.*;
import com.gic.haoban.manage.service.task.BaseSyncOperation;
......@@ -54,9 +53,6 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
private PreDealService preDealService;
@Autowired
private DepartmentApiService departmentApiService;
@Autowired
private SyncTaskService syncTaskService;
@Autowired
......@@ -106,43 +102,32 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
logger.info("待处理数据不存在:{}", params);
return;
}
TabHaobanSyncTask syncTask = syncTaskService.getSyncTask(dealParamMqDTO.getTaskId());
//部门处理
if (dataPre.getDataType().equals(PreDealTypeEnum.group.getVal())) {
if (syncTask.getTaskType().equals(0)) {
operationMap.get("groupSyncOperation").dealSingleByMq(dealParamMqDTO, dataPre);
} else {
operationMap.get("qywxDeptSyncOperation").dealSingleByMq(dealParamMqDTO, dataPre);
}
//门店处理
} else if (dataPre.getDataType().equals(PreDealTypeEnum.store.getVal())) {
logger.info("门店处理：{}", params);
operationMap.get("storeSyncOperation").dealSingleByMq(dealParamMqDTO, dataPre);
//成员处理
//TabHaobanSyncTask syncTask = syncTaskService.getSyncTask(dealParamMqDTO.getTaskId());
if (dataPre.getDataType().equals(PreDealTypeEnum.dept.getVal())) {
//部门处理
operationMap.get("qywxDeptSyncOperation").dealSingleByMq(dealParamMqDTO, dataPre);
} else if (dataPre.getDataType().equals(PreDealTypeEnum.clerk.getVal())) {
logger.info("店员处理：{}", params);
if (syncTask.getTaskType().equals(0)) {
operationMap.get("clerkSyncOperation").dealSingleByMq(dealParamMqDTO, dataPre);
} else {
operationMap.get("qywxStaffSyncOperation").dealSingleByMq(dealParamMqDTO, dataPre);
}
//成员处理
logger.info("成员处理：{}", params);
operationMap.get("qywxStaffSyncOperation").dealSingleByMq(dealParamMqDTO, dataPre);
} else if (dataPre.getDataType().equals(PreDealTypeEnum.friend_clerk.getVal())) {
logger.info("好友导购处理：{}", params);
operationMap.get("friendClerkSyncNewOperation").dealSingleByMq(dealParamMqDTO, dataPre);
} else if (dataPre.getDataType().equals(PreDealTypeEnum.friend.getVal())) {
operationMap.get("friendSyncNewOperation").dealSingleByMq(dealParamMqDTO, dataPre);
logger.info("第三方好友处理：{}", params);
operationMap.get("friendSyncNewOperation").dealSingleByMq(dealParamMqDTO, dataPre);
} else if (dataPre.getDataType().equals(PreDealTypeEnum.self_friend.getVal())) {
operationMap.get("selfFriendSyncNewOperation").dealSingleByMq(dealParamMqDTO, dataPre);
logger.info("自建好友处理：{}", params);
operationMap.get("selfFriendSyncNewOperation").dealSingleByMq(dealParamMqDTO, dataPre);
} else if (dataPre.getDataType().equals(PreDealTypeEnum.tag.getVal())) {
operationMap.get("friendTagSyncOperation").dealSingleByMq(dealParamMqDTO, dataPre);
logger.info("会员标签处理：{}", params);
operationMap.get("friendTagSyncOperation").dealSingleByMq(dealParamMqDTO, dataPre);
} else if (dataPre.getDataType().equals(PreDealTypeEnum.tag_member.getVal())) {
operationMap.get("friendMemberTagSyncOperation").dealSingleByMq(dealParamMqDTO, dataPre);
logger.info("会员标签处理标签项：{}", params);
operationMap.get("friendMemberTagSyncOperation").dealSingleByMq(dealParamMqDTO, dataPre);
} else {
logger.info("不是正常数据:{}", params);
logger.info("不是正常数据类型:{}", params);
}
}
......@@ -183,12 +168,12 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
return;
}
int groupErrCount = preDealService.countExcepAndPreByTaskId(taskId, PreDealTypeEnum.group.getVal());
int groupErrCount = preDealService.countExcepAndPreByTaskId(taskId, PreDealTypeEnum.dept.getVal());
int storeErrCount = preDealService.countExcepAndPreByTaskId(taskId, PreDealTypeEnum.store.getVal());
List<TabHaobanPreDealLog> list = null;
if (dataType == -1) {
if (groupErrCount > 0) {
dataType = PreDealTypeEnum.group.getVal();
dataType = PreDealTypeEnum.dept.getVal();
list = preDealService.queryDepartRebuildDealLog(taskId);
} else if (storeErrCount > 0) {
dataType = PreDealTypeEnum.store.getVal();
......@@ -204,7 +189,7 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
}
Set<String> midList = list.stream().map(TabHaobanPreDealLog::getDataId).collect(Collectors.toSet());
//根据类型获取状态
SyncTaskStatusEnum syncTaskStatusEnum = (dataType == PreDealTypeEnum.group.getVal() ? SyncTaskStatusEnum.group_sync
SyncTaskStatusEnum syncTaskStatusEnum = (dataType == PreDealTypeEnum.dept.getVal() ? SyncTaskStatusEnum.group_sync
: (dataType == PreDealTypeEnum.store.getVal() ? SyncTaskStatusEnum.store_sync : SyncTaskStatusEnum.clerk_sync));
logger.info("处理开始:类型:{}", syncTaskStatusEnum.getVal());
//处理预处理数据
......@@ -306,7 +291,7 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
} else {
dealLog.setpDataId(storeGroupDTO.getParentGroupId());
}
dealLog.setDataType(PreDealTypeEnum.group.getVal());
dealLog.setDataType(PreDealTypeEnum.dept.getVal());
dealLog.setStatusFlag(0);
dealLog.setTaskId(taskId);
dealLog.setEnterpriseId(storeGroupDTO.getEnterpriseId());
......@@ -456,7 +441,7 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
int totalCount = preDealService.countByTaskId(taskId, -1, -1);
int groupErrCount = preDealService.countByTaskId(taskId, PreDealTypeEnum.group.getVal(), PreDealStatusEnum.exception.getVal());
int groupErrCount = preDealService.countByTaskId(taskId, PreDealTypeEnum.dept.getVal(), PreDealStatusEnum.exception.getVal());
int storeErrCount = preDealService.countByTaskId(taskId, PreDealTypeEnum.store.getVal(), PreDealStatusEnum.exception.getVal());
int clerkErrCount = preDealService.countByTaskId(taskId, PreDealTypeEnum.clerk.getVal(), PreDealStatusEnum.exception.getVal());
int preCount = preDealService.countByTaskId(taskId, -1, PreDealStatusEnum.pre.getVal());
......@@ -499,7 +484,7 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
if (syncTask.getTaskType().equals(0)) {
List<PreDealLogInfoDTO> result = page.getResult();
for (PreDealLogInfoDTO dto : result) {
if (dto.getDataType().equals(PreDealTypeEnum.group.getVal())) {
if (dto.getDataType().equals(PreDealTypeEnum.dept.getVal())) {
StoreGroupDTO midGroup = storeGroupService.getStoreGroupById(dto.getDataId());
if (midGroup != null) {
dto.setDataName(midGroup.getStoreGroupName());
......@@ -580,7 +565,7 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
@Override
public void cleanDiffrence(String wxEnterpriseId, String taskId) {
List<TabHaobanPreDealLog> groupList = preDealService.listByTaskId(taskId, PreDealTypeEnum.group.getVal(), PreDealStatusEnum.computed.getVal());
List<TabHaobanPreDealLog> groupList = preDealService.listByTaskId(taskId, PreDealTypeEnum.dept.getVal(), PreDealStatusEnum.computed.getVal());
List<TabHaobanPreDealLog> clerkList = preDealService.listByTaskId(taskId, PreDealTypeEnum.clerk.getVal(), PreDealStatusEnum.computed.getVal());
//清空staff
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/QywxDeptSyncOperation.java
......@@ -132,7 +132,7 @@ public class QywxDeptSyncOperation implements BaseSyncOperation {
@Override
public void dealException(String taskId, String dataId, String enterpriseId, String reason) {
logger.info("部门同步异常：{},{}", taskId, dataId);
preDealService.updateStatusByDataId(taskId, dataId, PreDealTypeEnum.group.getVal(), PreDealStatusEnum.exception.getVal(), reason);
preDealService.updateStatusByDataId(taskId, dataId, PreDealTypeEnum.dept.getVal(), PreDealStatusEnum.exception.getVal(), reason);
logger.info("递归调用更新状态start==:{},d:{}", taskId, dataId);
changeChildStatus(taskId, dataId);
logger.info("递归调用更新状态end==:{},d:{}", taskId, dataId);
......@@ -146,12 +146,12 @@ public class QywxDeptSyncOperation implements BaseSyncOperation {
* @param dataId
*/
private void changeChildStatus(String taskId, String dataId) {
List<TabHaobanPreDealLog> child = preDealService.listByPDataId(taskId, dataId, PreDealTypeEnum.group.getVal());
List<TabHaobanPreDealLog> child = preDealService.listByPDataId(taskId, dataId, PreDealTypeEnum.dept.getVal());
if (CollectionUtils.isEmpty(child)) {
return;
}
child.forEach(tab -> {
preDealService.updateStatusByDataId(taskId, tab.getDataId(), PreDealTypeEnum.group.getVal(), PreDealStatusEnum.exception.getVal(), "父分组同步异常");
preDealService.updateStatusByDataId(taskId, tab.getDataId(), PreDealTypeEnum.dept.getVal(), PreDealStatusEnum.exception.getVal(), "父分组同步异常");
changeChildStatus(taskId, tab.getDataId());
});
}
......@@ -164,7 +164,7 @@ public class QywxDeptSyncOperation implements BaseSyncOperation {
logger.info("没有配置secret:{},{}", taskId, wxEnterpriseId);
return;
}
TabHaobanPreDealLog preData = preDealService.getByDataId(taskId, dataId, PreDealTypeEnum.group.getVal(), -1);
TabHaobanPreDealLog preData = preDealService.getByDataId(taskId, dataId, PreDealTypeEnum.dept.getVal(), -1);
String pDataId = preData.getpDataId();
if ("0".equals(pDataId)) {
//根级部门
......@@ -195,7 +195,7 @@ public class QywxDeptSyncOperation implements BaseSyncOperation {
}
}
boolean b = preDealService.updateStatusByDataId(taskId, dataId, PreDealTypeEnum.group.getVal(), PreDealStatusEnum.computed.getVal(), "成功");
boolean b = preDealService.updateStatusByDataId(taskId, dataId, PreDealTypeEnum.dept.getVal(), PreDealStatusEnum.computed.getVal(), "成功");
if (!b) {
logger.info("成功修改错误！{}", dataId);
return;
......@@ -211,7 +211,7 @@ public class QywxDeptSyncOperation implements BaseSyncOperation {
@Override
public void checkDepartmentTask(String taskId) {
boolean b = preDealService.checkTask(taskId, PreDealTypeEnum.group.getVal());
boolean b = preDealService.checkTask(taskId, PreDealTypeEnum.dept.getVal());
if (!b) {
return;
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/tag/FriendMemberTagSyncOperation.java
......@@ -2,8 +2,6 @@ package com.gic.haoban.manage.service.task.tag;
import com.alibaba.fastjson.JSONObject;
import com.gic.api.base.commons.Page;
import com.gic.clerk.api.service.ClerkService;
import com.gic.commons.util.GICMQClientUtil;
import com.gic.haoban.app.customer.dto.SearchComputeDTO;
import com.gic.haoban.app.customer.dto.SearchDataDTO;
import com.gic.haoban.base.api.common.BasePageInfo;
......@@ -12,27 +10,18 @@ import com.gic.haoban.manage.api.dto.ExternalClerkRelatedDTO;
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.*;
import com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService;
import com.gic.haoban.manage.service.entity.TabHaobanPreDealLog;
import com.gic.haoban.manage.service.entity.TabHaobanSyncTask;
import com.gic.haoban.manage.service.service.PreDealService;
import com.gic.haoban.manage.service.service.StaffClerkRelationService;
import com.gic.haoban.manage.service.service.SyncTaskService;
import com.gic.haoban.manage.service.service.WxEnterpriseRelatedService;
import com.gic.haoban.manage.service.task.BaseSyncOperation;
import com.gic.haoban.manage.service.util.EmojiFilterUtil;
import com.gic.member.api.service.MemberTagService;
import com.gic.member.tag.api.service.MemberTagApiService;
import com.gic.mq.sdk.GicMQClient;
import com.gic.redis.data.util.RedisUtil;
import com.gic.search.engine.api.constant.MemberDataEnum;
import com.gic.search.engine.api.constant.OperateEnum;
import com.gic.search.engine.api.dto.ESResponseQueryBatch;
import com.gic.search.engine.api.dto.ESResponseQueryCount;
import com.gic.search.engine.api.dto.dynamic.DynamicSearchDTO;
import com.gic.search.engine.api.service.dynamic.ESDataDynamicOperationApiService;
import com.gic.wechat.api.dto.qywx.UserDTO;
import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
......@@ -40,7 +29,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
......@@ -59,37 +47,9 @@ public class FriendMemberTagSyncOperation implements BaseSyncOperation {
@Autowired
private PreDealService preDealService;
@Autowired
private MemberUnionidRelatedApiService memberUnionidRelatedApiService;
@Autowired
private SyncTaskService syncTaskService;
@Autowired
private ClerkMainStoreRelatedApiService clerkMainStoreRelatedApiService;
@Autowired
private StaffApiService staffApiService;
@Autowired
private StaffClerkRelationService staffClerkRelationService;
@Autowired
private ClerkService clerkService;
@Autowired
private ExternalClerkRelatedApiService externalClerkRelatedApiService;
@Autowired
private WxEnterpriseRelatedService wxEnterpriseRelatedService;
@Autowired
private MemberTagService memberTagService;
@Autowired
private MemberTagApiService memberTagApiService;
@Autowired
private QywxSuiteApiService qywxSuiteApiService;
@Autowired
private QywxTagApiService qywxTagApiService;
@Autowired
private ESDataDynamicOperationApiService esDataDynamicOperationApiService;
......@@ -182,7 +142,7 @@ public class FriendMemberTagSyncOperation implements BaseSyncOperation {
@Override
public void dealException(String taskId, String dataId, String enterpriseId, String reason) {
logger.info("标签同步异常：{},{}", taskId, dataId);
preDealService.updateStatusByDataId(taskId, dataId, PreDealTypeEnum.group.getVal(), PreDealStatusEnum.exception.getVal(), reason);
preDealService.updateStatusByDataId(taskId, dataId, PreDealTypeEnum.dept.getVal(), PreDealStatusEnum.exception.getVal(), reason);
checkDepartmentTask(taskId);
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/tag/FriendTagSyncOperation.java
......@@ -2,8 +2,6 @@ package com.gic.haoban.manage.service.task.tag;
import com.alibaba.fastjson.JSONObject;
import com.gic.api.base.commons.Page;
import com.gic.clerk.api.service.ClerkService;
import com.gic.clerk.api.service.PowerService;
import com.gic.commons.util.GICMQClientUtil;
import com.gic.haoban.app.customer.dto.SearchComputeDTO;
import com.gic.haoban.app.customer.dto.SearchDataDTO;
......@@ -12,20 +10,12 @@ import com.gic.haoban.manage.api.dto.DealParamMqDTO;
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.ClerkMainStoreRelatedApiService;
import com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService;
import com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService;
import com.gic.haoban.manage.api.service.StaffApiService;
import com.gic.haoban.manage.service.entity.TabHaobanPreDealLog;
import com.gic.haoban.manage.service.entity.TabHaobanSyncTask;
import com.gic.haoban.manage.service.service.PreDealService;
import com.gic.haoban.manage.service.service.StaffClerkRelationService;
import com.gic.haoban.manage.service.service.SyncTaskService;
import com.gic.haoban.manage.service.service.WxEnterpriseRelatedService;
import com.gic.haoban.manage.service.task.BaseSyncOperation;
import com.gic.member.api.service.MemberOpenCardBusinessService;
import com.gic.member.api.service.MemberTagService;
import com.gic.member.tag.api.service.MemberTagApiService;
import com.gic.mq.sdk.GicMQClient;
import com.gic.redis.data.util.RedisUtil;
import com.gic.search.engine.api.constant.MemberDataEnum;
......@@ -58,42 +48,15 @@ public class FriendTagSyncOperation implements BaseSyncOperation {
@Autowired
private PreDealService preDealService;
@Autowired
private MemberUnionidRelatedApiService memberUnionidRelatedApiService;
@Autowired
private SyncTaskService syncTaskService;
@Autowired
private ClerkMainStoreRelatedApiService clerkMainStoreRelatedApiService;
@Autowired
private StaffApiService staffApiService;
@Autowired
private StaffClerkRelationService staffClerkRelationService;
@Autowired
private ClerkService clerkService;
@Autowired
private PowerService powerService;
@Autowired
private MemberOpenCardBusinessService memberOpenCardBusinessService;
@Autowired
private FriendMemberTagSyncOperation friendMemberTagSyncOperation;
@Autowired
private WxEnterpriseRelatedService wxEnterpriseRelatedService;
@Autowired
private MemberTagService memberTagService;
@Autowired
private MemberTagApiService memberTagApiService;
@Autowired
private ExternalClerkRelatedApiService externalClerkRelatedApiService;
@Autowired
private ESDataDynamicOperationApiService esDataDynamicOperationApiService;
@Override
public void dealSingleByMq(DealParamMqDTO dealParamMqDTO, TabHaobanPreDealLog dataPre) {
logger.info("处理标签同步初始化：{}", JSONObject.toJSONString(dealParamMqDTO));
......@@ -188,7 +151,7 @@ public class FriendTagSyncOperation implements BaseSyncOperation {
@Override
public void dealException(String taskId, String dataId, String enterpriseId, String reason) {
logger.info("部门同步异常：{},{}", taskId, dataId);
preDealService.updateStatusByDataId(taskId, dataId, PreDealTypeEnum.group.getVal(), PreDealStatusEnum.exception.getVal(), reason);
preDealService.updateStatusByDataId(taskId, dataId, PreDealTypeEnum.dept.getVal(), PreDealStatusEnum.exception.getVal(), reason);
logger.info("递归调用更新状态end==:{},d:{}", taskId, dataId);
checkDepartmentTask(taskId);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment