Skip to content

H
haoban-manage3.0
Commit eeb3a234 by 墨竹
Options

refactor:删除无效代码

parent 7e84fc10
Showing with 55 additions and 83 deletions
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/PreDealServiceImpl.java
......@@ -5,16 +5,13 @@ import com.gic.haoban.base.api.common.BasePageInfo;
import com.gic.haoban.common.utils.EntityUtil;
import com.gic.haoban.common.utils.PageUtil;
import com.gic.haoban.manage.api.dto.PreDealLogInfoDTO;
import com.gic.haoban.manage.api.dto.SyncCheckDTO;
import com.gic.haoban.manage.api.enums.PreDealStatusEnum;
import com.gic.haoban.manage.api.enums.PreDealTypeEnum;
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 com.gic.haoban.manage.service.task.QywxGroupSyncOperation;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import org.apache.commons.collections.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -42,28 +39,28 @@ public class PreDealServiceImpl implements PreDealService {
if (CollectionUtils.isEmpty(list)) {
return true;
}
//插入不存在的我们pre表的企业微信数据
int count = list.size();
int pre = count/pageSize+1;
int yushu = count%pageSize;
if(yushu==0){
pre = pre - 1;
}
int i= 0;
while(i<pre){
logger.info("这是第{}次，进入",i);
i++;
int fromIndex = (i-1)*pageSize;
int toIndex = (count-fromIndex) > pageSize ? (fromIndex+pageSize):count;
List<TabHaobanPreDealLog>subList = list.subList(fromIndex, toIndex);
preDealLogMapper.insertSelectiveBatch(subList);
}
//插入不存在的我们pre表的企业微信数据
int count = list.size();
int pre = count / pageSize + 1;
int yushu = count % pageSize;
if (yushu == 0) {
pre = pre - 1;
}
int i = 0;
while (i < pre) {
logger.info("这是第{}次，进入", i);
i++;
int fromIndex = (i - 1) * pageSize;
int toIndex = (count - fromIndex) > pageSize ? (fromIndex + pageSize) : count;
List<TabHaobanPreDealLog> subList = list.subList(fromIndex, toIndex);
preDealLogMapper.insertSelectiveBatch(subList);
}
return true;
}
@Override
public TabHaobanPreDealLog getByDataId(String taskId, String dataId,int dataType, int status) {
List<TabHaobanPreDealLog> list = preDealLogMapper.getByDataId(taskId, dataId,dataType, status);
public TabHaobanPreDealLog getByDataId(String taskId, String dataId, int dataType, int status) {
List<TabHaobanPreDealLog> list = preDealLogMapper.getByDataId(taskId, dataId, dataType, status);
if (CollectionUtils.isEmpty(list)) {
return null;
} else {
......@@ -83,13 +80,13 @@ public class PreDealServiceImpl implements PreDealService {
@Override
public boolean updateStatusByDataId(String taskId, String dataId, int status, String reason) {
int i = preDealLogMapper.updateStatusByDataId(taskId, dataId,-1, status, reason);
int i = preDealLogMapper.updateStatusByDataId(taskId, dataId, -1, status, reason);
return i >= 0;
}
@Override
public boolean updateStatusByDataId(String taskId, String dataId, int dataType, int status, String reason) {
int i = preDealLogMapper.updateStatusByDataId(taskId, dataId,dataType, status, reason);
int i = preDealLogMapper.updateStatusByDataId(taskId, dataId, dataType, status, reason);
return i >= 0;
}
......@@ -140,38 +137,38 @@ public class PreDealServiceImpl implements PreDealService {
@Override
public boolean existDataId(String taskId, String dataId) {
int i = preDealLogMapper.countByDataId(taskId, dataId,PreDealTypeEnum.clerk.getVal());
int i = preDealLogMapper.countByDataId(taskId, dataId, PreDealTypeEnum.clerk.getVal());
return i > 0;
}
@Override
public List<String> listDataIdByTaskIdAndDataType(String taskId, Integer dateType) {
List<String> list = preDealLogMapper.listDataIdByTaskIdAndDataType(taskId,dateType);
if(list == null){
list = new ArrayList<String>();
List<String> list = preDealLogMapper.listDataIdByTaskIdAndDataType(taskId, dateType);
if (list == null) {
list = new ArrayList<String>();
}
return list;
}
@Override
public PreDealLogInfoDTO getLastPreDataByTaskId(String taskId) {
TabHaobanPreDealLog preDealLog = preDealLogMapper.getLastPreDataByTaskId(taskId);
return EntityUtil.changeEntityByOrika(PreDealLogInfoDTO.class,preDealLog);
return EntityUtil.changeEntityByOrika(PreDealLogInfoDTO.class, preDealLog);
}
@Override
public String getRootDataIdByWxEnterpriseIdAndTaskId(String wxEnterpriseId,
String taskId) {
return preDealLogMapper.getRootDataIdByWxEnterpriseIdAndTaskId( wxEnterpriseId, taskId);
}
@Override
public String getRootDataIdByWxEnterpriseIdAndTaskId(String wxEnterpriseId,
String taskId) {
return preDealLogMapper.getRootDataIdByWxEnterpriseIdAndTaskId(wxEnterpriseId, taskId);
}
@Override
public boolean updateFriendStatusByDataId(String taskId, String dataId, int status, String reason, String dataContent) {
int i = preDealLogMapper.updateFriendStatusByDataId(taskId, dataId, status, reason,dataContent);
@Override
public boolean updateFriendStatusByDataId(String taskId, String dataId, int status, String reason, String dataContent) {
int i = preDealLogMapper.updateFriendStatusByDataId(taskId, dataId, status, reason, dataContent);
return i >= 0;
}
}
@Override
public boolean updateFriendStatusByDataId(String taskId, String dataId, int status, String reason, String dataContent, String relationKey) {
......@@ -181,13 +178,13 @@ public class PreDealServiceImpl implements PreDealService {
@Override
public boolean checkStaffTaskByTaskIdAndPDataId(String taskId, String pDataId) {
return preDealLogMapper.countFailStaffTaskByTaskIdAndPDataId(taskId,pDataId) == 0;
}
return preDealLogMapper.countFailStaffTaskByTaskIdAndPDataId(taskId, pDataId) == 0;
}
@Override
public List<TabHaobanPreDealLog> listByPDataIdAndTaskId(String taskId, String wxUserId) {
return preDealLogMapper.listByPDataIdAndTaskId(taskId,wxUserId);
}
@Override
public List<TabHaobanPreDealLog> listByPDataIdAndTaskId(String taskId, String wxUserId) {
return preDealLogMapper.listByPDataIdAndTaskId(taskId, wxUserId);
}
@Override
public TabHaobanPreDealLog getByRelationKey(String taskId, Integer dataType, String relationKey) {
......
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.JSON;
import com.alibaba.fastjson.JSONObject;
import com.gic.api.base.commons.Page;
import com.gic.clerk.api.dto.ClerkDTO;
......@@ -12,30 +11,17 @@ 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.BasePageInfo;
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.common.utils.PageUtil;
import com.gic.haoban.manage.api.dto.*;
import com.gic.haoban.manage.api.enums.*;
import com.gic.haoban.manage.api.service.ClerkMainStoreRelatedApiService;
import com.gic.haoban.manage.api.service.DealSyncOperationApiService;
import com.gic.haoban.manage.api.service.DepartmentApiService;
import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
import com.gic.haoban.manage.service.entity.TabHaobanClerkMainStoreRelated;
import com.gic.haoban.manage.service.entity.TabHaobanDepartment;
import com.gic.haoban.manage.service.entity.TabHaobanPreDealLog;
import com.gic.haoban.manage.service.entity.TabHaobanStaff;
import com.gic.haoban.manage.service.entity.TabHaobanStaffClerkRelation;
import com.gic.haoban.manage.service.entity.TabHaobanSyncTask;
import com.gic.haoban.manage.service.entity.*;
import com.gic.haoban.manage.service.service.*;
import com.gic.haoban.manage.service.task.BaseSyncOperation;
import com.gic.mq.sdk.GicMQClient;
import com.gic.redis.data.util.RedisUtil;
import com.gic.wechat.api.service.qywx.QywxDepartmentApiService;
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.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.time.DateUtils;
......@@ -46,7 +32,6 @@ import org.springframework.stereotype.Service;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collector;
import java.util.stream.Collectors;
/**
......@@ -114,10 +99,9 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
@Override
public void departmentDealMq(String params) {
logger.info("mq处理中:{}", params);
logger.info("部门同步处理mq处理中:{}", params);
DealParamMqDTO dealParamMqDTO = JSONObject.parseObject(params, DealParamMqDTO.class);
TabHaobanPreDealLog dataPre = preDealService.getByDataId(dealParamMqDTO.getTaskId()
, dealParamMqDTO.getData(),dealParamMqDTO.getType()-1, PreDealStatusEnum.all.getVal());
TabHaobanPreDealLog dataPre = preDealService.getByDataId(dealParamMqDTO.getTaskId(), dealParamMqDTO.getData(), dealParamMqDTO.getType() - 1, PreDealStatusEnum.all.getVal());
if (dataPre == null) {
logger.info("待处理数据不存在:{}", params);
......@@ -315,10 +299,7 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
return false;
}
Integer storeFlag = dto.getStoreFlag();
if (storeFlag.equals(1)) {
return false;
}
return true;
return !storeFlag.equals(1);
}).collect(Collectors.groupingBy(SyncSingleDealDTO::getEnterpriseId
, Collectors.mapping(SyncSingleDealDTO::getRelatedId, Collectors.toList())));
......@@ -328,10 +309,7 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
List<StoreGroupDTO> groupDTOList = storeGroupService.listStoreGroupAndChildren(v.toArray(new String[]{}), k);
List<String> hasKey=new ArrayList<>();
List<TabHaobanPreDealLog> dealList = groupDTOList.stream().filter(dto->{
if (hasKey.contains(dto.getStoreGroupId())) {
return false;
}
return true;
return !hasKey.contains(dto.getStoreGroupId());
}).map(storeGroupDTO -> {
TabHaobanPreDealLog dealLog = new TabHaobanPreDealLog();
dealLog.setDataId(storeGroupDTO.getStoreGroupId());
......@@ -640,7 +618,7 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
//清空cleak
if (CollectionUtils.isNotEmpty(groupList)) {
List<String> groupIdList = (List<String>) groupList.stream().map(TabHaobanPreDealLog::getDataId).collect(Collectors.toList());
List<String> groupIdList = groupList.stream().map(TabHaobanPreDealLog::getDataId).collect(Collectors.toList());
departmentService.cleanDepartment(wxEnterpriseId,groupIdList);
}
......@@ -671,8 +649,8 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
Map<String,TabHaobanClerkMainStoreRelated> map = mainStoreList.stream().collect(Collectors.toMap(TabHaobanClerkMainStoreRelated::getStaffId, s -> s));
List<TabHaobanPreDealLog> dealLogList = relationList.stream().filter(ls->map.get(ls.getStaffId()) != null).map(dto -> {
TabHaobanPreDealLog dealLog = new TabHaobanPreDealLog();
dealLog.setDataId(dto.getWxUserId().toString());
dealLog.setpDataId(dto.getStaffId().toString());
dealLog.setDataId(dto.getWxUserId());
dealLog.setpDataId(dto.getStaffId());
dealLog.setDataType(PreDealTypeEnum.friend_clerk.getVal());
dealLog.setStatusFlag(0);
dealLog.setTaskId(taskId);
......@@ -808,8 +786,8 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
relationList.add(tab9);
List<TabHaobanPreDealLog> dealLogList = relationList.stream().map(dto -> {
TabHaobanPreDealLog dealLog = new TabHaobanPreDealLog();
dealLog.setDataId(dto.getWxUserId().toString());
dealLog.setpDataId(dto.getStaffId().toString());
dealLog.setDataId(dto.getWxUserId());
dealLog.setpDataId(dto.getStaffId());
dealLog.setDataType(PreDealTypeEnum.friend_clerk.getVal());
dealLog.setStatusFlag(0);
dealLog.setTaskId(taskId);
......@@ -868,10 +846,7 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
public boolean getFreshFriendSyncTask(String wxEnterpriseId, String staffId) {
String staffLockKey = FRIEND_LOCK + staffId;
Object cache = RedisUtil.getCache(staffLockKey);
if (null == cache) {
return false;
}
return true;
return null != cache;
}
@Override
......
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