demand: 客户账单查询-cpu飙升问题定位解决
committer: heyu
This commit is contained in:
parent
8d9b0aef0b
commit
b9ab49daf6
@ -924,7 +924,7 @@ public class EmisCommonController extends EmisBaseController
|
|||||||
redissonService.setStr(statusKey, "RUNNING", 1800);
|
redissonService.setStr(statusKey, "RUNNING", 1800);
|
||||||
|
|
||||||
// 异步执行任务
|
// 异步执行任务
|
||||||
// emisTmsSiteBatchMissService.autoScanSiteBatch(lineCode);
|
emisTmsSiteBatchMissService.autoScanSiteBatch(lineCode);
|
||||||
log.info("autoScanSiteBatch async task started");
|
log.info("autoScanSiteBatch async task started");
|
||||||
|
|
||||||
return AjaxResult.success("异步任务已启动,请稍后查看执行结果");
|
return AjaxResult.success("异步任务已启动,请稍后查看执行结果");
|
||||||
|
|||||||
@ -16,7 +16,10 @@ package com.xdadan.erp.emis.service;
|
|||||||
import com.beust.jcommander.internal.Lists;
|
import com.beust.jcommander.internal.Lists;
|
||||||
import com.xdadan.erp.common.core.domain.entity.SysUser;
|
import com.xdadan.erp.common.core.domain.entity.SysUser;
|
||||||
import com.xdadan.erp.common.core.redis.RedissonService;
|
import com.xdadan.erp.common.core.redis.RedissonService;
|
||||||
import com.xdadan.erp.common.utils.*;
|
import com.xdadan.erp.common.utils.DateUtils;
|
||||||
|
import com.xdadan.erp.common.utils.DictUtils;
|
||||||
|
import com.xdadan.erp.common.utils.NoticeUtils;
|
||||||
|
import com.xdadan.erp.common.utils.SecurityUtils;
|
||||||
import com.xdadan.erp.emis.domain.*;
|
import com.xdadan.erp.emis.domain.*;
|
||||||
import com.xdadan.erp.emis.domain.enumtype.*;
|
import com.xdadan.erp.emis.domain.enumtype.*;
|
||||||
import com.xdadan.erp.emis.domain.exception.EmisBizError;
|
import com.xdadan.erp.emis.domain.exception.EmisBizError;
|
||||||
@ -41,6 +44,7 @@ package com.xdadan.erp.emis.service;
|
|||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.beans.BeanUtils;
|
import org.springframework.beans.BeanUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.cglib.beans.BeanCopier;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
import org.springframework.util.CollectionUtils;
|
import org.springframework.util.CollectionUtils;
|
||||||
@ -54,7 +58,6 @@ package com.xdadan.erp.emis.service;
|
|||||||
import java.time.format.DateTimeParseException;
|
import java.time.format.DateTimeParseException;
|
||||||
import java.time.temporal.ChronoUnit;
|
import java.time.temporal.ChronoUnit;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.Set;
|
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -197,6 +200,9 @@ public class EmisBaseService {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private EmisTmsSiteBatchDtlMapper emisTmsSiteBatchDtlMapper;
|
private EmisTmsSiteBatchDtlMapper emisTmsSiteBatchDtlMapper;
|
||||||
|
|
||||||
|
private static final BeanCopier TRANS_PLAN_RULE_COPIER =
|
||||||
|
BeanCopier.create(EmisTransPlanRule.class, EmisTransPlanRule.class, false);
|
||||||
|
|
||||||
private static SysUser emptySysUser = new SysUser();
|
private static SysUser emptySysUser = new SysUser();
|
||||||
|
|
||||||
static {
|
static {
|
||||||
@ -4512,8 +4518,8 @@ public class EmisBaseService {
|
|||||||
visitedIds.add(source.getId());
|
visitedIds.add(source.getId());
|
||||||
visitPath.add(source.getId());
|
visitPath.add(source.getId());
|
||||||
|
|
||||||
EmisTransPlanRule copy = new EmisTransPlanRule();
|
EmisTransPlanRule copy = new EmisTransPlanRule();
|
||||||
BeanUtils.copyProperties(source, copy);
|
TRANS_PLAN_RULE_COPIER.copy(source, copy, null);
|
||||||
|
|
||||||
// 为每个新节点生成唯一treeId
|
// 为每个新节点生成唯一treeId
|
||||||
copy.setTreeId(com.xdadan.erp.common.utils.idgen.UUID.fastUUID().toString());
|
copy.setTreeId(com.xdadan.erp.common.utils.idgen.UUID.fastUUID().toString());
|
||||||
|
|||||||
@ -248,7 +248,7 @@ public class EmisTmsSiteBatchMissServiceImpl extends EmisBaseService implements
|
|||||||
|
|
||||||
// 3) 调用scanSiteBatchByWaybills重新扫描
|
// 3) 调用scanSiteBatchByWaybills重新扫描
|
||||||
if (!waybills.isEmpty()) {
|
if (!waybills.isEmpty()) {
|
||||||
// this.scanSiteBatchByWaybills(waybills);
|
this.scanSiteBatchByWaybills(waybills);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -509,7 +509,7 @@ public class EmisTmsSiteBatchServiceImpl extends EmisBaseService implements IEmi
|
|||||||
if (CollectionUtil.isEmpty(waybills)) {
|
if (CollectionUtil.isEmpty(waybills)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// scanSiteBatchByWaybills(waybills);
|
scanSiteBatchByWaybills(waybills);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user