From 0a91d2f514d4d6a9f08b36372b12f5855e22b146 Mon Sep 17 00:00:00 2001 From: DOUDOU <877258667@qq.com> Date: Tue, 16 Apr 2024 10:59:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=98=E8=8E=89=20=20=E5=8E=9F=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E6=89=93=E5=8D=B0=E6=B5=81=E6=B0=B4=E5=8F=B7=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E7=9A=84=E9=80=BB=E8=BE=91BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gaotao/common/aop/RepeatSubmitAspect.java | 2 +- .../entity/SoReceiveBoxesEntity.java | 2 +- .../impl/ReportfileSeqinfoServiceImpl.java | 17 +++++++++++++++-- .../service/impl/OutBoxPrintServiceImpl.java | 12 ++++++------ .../schedule/controller/ScheduleController.java | 1 + 5 files changed, 24 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/gaotao/common/aop/RepeatSubmitAspect.java b/src/main/java/com/gaotao/common/aop/RepeatSubmitAspect.java index e04e13c..9a6b688 100644 --- a/src/main/java/com/gaotao/common/aop/RepeatSubmitAspect.java +++ b/src/main/java/com/gaotao/common/aop/RepeatSubmitAspect.java @@ -31,7 +31,7 @@ public class RepeatSubmitAspect { //缓存数据存放 后续要改小时间 目前十秒钟 private static final Cache caches = CacheBuilder.newBuilder() - .maximumSize(10000).expireAfterWrite(5, TimeUnit.SECONDS).build(); + .maximumSize(10000).expireAfterWrite(10, TimeUnit.SECONDS).build(); //切点 @Pointcut("@annotation(com.gaotao.common.annotation.RepeatSubmit)") diff --git a/src/main/java/com/gaotao/modules/finishedProduct/entity/SoReceiveBoxesEntity.java b/src/main/java/com/gaotao/modules/finishedProduct/entity/SoReceiveBoxesEntity.java index c799bc7..c738036 100644 --- a/src/main/java/com/gaotao/modules/finishedProduct/entity/SoReceiveBoxesEntity.java +++ b/src/main/java/com/gaotao/modules/finishedProduct/entity/SoReceiveBoxesEntity.java @@ -57,7 +57,7 @@ public class SoReceiveBoxesEntity implements Serializable { /** * $column.comments */ - private Integer rollsQty; + private Float rollsQty; /** * $column.comments */ diff --git a/src/main/java/com/gaotao/modules/finishedProduct/service/impl/ReportfileSeqinfoServiceImpl.java b/src/main/java/com/gaotao/modules/finishedProduct/service/impl/ReportfileSeqinfoServiceImpl.java index d343417..2db3131 100644 --- a/src/main/java/com/gaotao/modules/finishedProduct/service/impl/ReportfileSeqinfoServiceImpl.java +++ b/src/main/java/com/gaotao/modules/finishedProduct/service/impl/ReportfileSeqinfoServiceImpl.java @@ -54,10 +54,23 @@ public class ReportfileSeqinfoServiceImpl extends ServiceImpl itemMap.get(key)) .filter(value-> value!= null) - .collect(Collectors.joining("+")); + .collect(Collectors.joining("+"));*/ + String keyValueInfo = keyValueBuilder.toString(); logger.info("流水号规则的值："+keyValueInfo); // 获取流水号规则 ReportfileSeqinfo reportfileSeqinfo = reportfileSeqinfoService.lambdaQuery() diff --git a/src/main/java/com/gaotao/modules/print/service/impl/OutBoxPrintServiceImpl.java b/src/main/java/com/gaotao/modules/print/service/impl/OutBoxPrintServiceImpl.java index 5eb1de7..6091327 100644 --- a/src/main/java/com/gaotao/modules/print/service/impl/OutBoxPrintServiceImpl.java +++ b/src/main/java/com/gaotao/modules/print/service/impl/OutBoxPrintServiceImpl.java @@ -119,12 +119,6 @@ public class OutBoxPrintServiceImpl implements OutBoxPrintService { List reportcontentitemList = reportcontentitemService.getReportcontentitemList(reportFileVo.getReportId()); Map itemMap = reportcontentitemList.stream().collect(Collectors.toMap(Reportcontentitem::getObjectgroup, Reportcontentitem::getDbfieldname)); - // 3.判断是否包含流水号 包含测返回流水号 - String seqNumber = reportfileSeqinfoService.getSeqNumber(reportFileVo.getReportId(), OutBoxConstant.SEQ_NUMBER); - if (StringUtils.isNotEmpty(seqNumber)) { - itemMap.put("流水号", seqNumber.toString()); - } - log.info("流水号处理完成"); // Map paramMap = outBoxParamVo.getParam().stream().collect(Collectors.toMap(ReportParametersEntity::getParametername, ReportParametersEntity::getOptionvalue)); Map paramMap = outBoxParamVo.getParam().stream().collect(HashMap::new, (m, v) -> m.put(v.getParametername(), v.getOptionvalue()), HashMap::putAll); log.info("手工参数处理开始{}", paramMap.toString()); @@ -160,6 +154,12 @@ public class OutBoxPrintServiceImpl implements OutBoxPrintService { } } log.info("手工参数处理结束{}", paramMap.toString()); + // 3.判断是否包含流水号 包含测返回流水号 + String seqNumber = reportfileSeqinfoService.getSeqNumber(reportFileVo.getReportId(), OutBoxConstant.SEQ_NUMBER, itemMap); + if (StringUtils.isNotEmpty(seqNumber)) { + itemMap.put("流水号", seqNumber.toString()); + } + log.info("流水号处理完成"); // 打印接口参数集 Map printOutMap = new HashMap<>(); int printQty = StringUtils.isNotEmpty(paramMap.get(OutBoxConstant.COPIES)) ? Integer.valueOf(paramMap.get(OutBoxConstant.COPIES)) : 1; diff --git a/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java b/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java index 10b822c..b15a2cc 100644 --- a/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java +++ b/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java @@ -1124,6 +1124,7 @@ public class ScheduleController extends AbstractController { * @return com.gaotao.common.utils.R **/ @RequestMapping(value = "checkCreateSplitSfdcRoll") + @RepeatSubmit public R checkCreateSplitSfdcRoll(@RequestBody SearchScheduleData inData) { Map resultMap = scheduleService.checkCreateSplitSfdcRoll(inData); return R.ok()