佘莉 原标签打印流水号业务的逻辑BUG

src/main/java/com/gaotao/common/aop/RepeatSubmitAspect.java

@@ -31,7 +31,7 @@ public class RepeatSubmitAspect {
 
 	//缓存数据存放 后续要改小时间 目前十秒钟
 	private static final Cache<String, Object> caches = CacheBuilder.newBuilder()
-			.maximumSize(10000).expireAfterWrite(5, TimeUnit.SECONDS).build();
+			.maximumSize(10000).expireAfterWrite(10, TimeUnit.SECONDS).build();
 	
 	//切点
 	@Pointcut("@annotation(com.gaotao.common.annotation.RepeatSubmit)")

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
 	 */

src/main/java/com/gaotao/modules/finishedProduct/service/impl/ReportfileSeqinfoServiceImpl.java

@@ -54,10 +54,23 @@ public class ReportfileSeqinfoServiceImpl extends ServiceImpl<ReportfileSeqinfoD
                 String keyInfo = reportcontentitemSeqrules.stream().map(ReportcontentitemSeqrule::getObjectname).collect(Collectors.joining("+"));
                 logger.info("流水号规则的key："+keyInfo);
                 //根据值获取value信息
-                String keyValueInfo = Arrays.stream(keyInfo.split("\\+"))
+                StringBuilder keyValueBuilder = new StringBuilder();
+                String[] keyArr = keyInfo.split("\\+");
+                //迭代处理数据
+                for(int i = 0; i < keyArr.length; i++){
+                    String tempValue = String.valueOf(itemMap.get(keyArr[i]));
+                    //判断是否是最后一个数据
+                    if(i == keyArr.length - 1){
+                        keyValueBuilder.append(tempValue);
+                    }else{
+                        keyValueBuilder.append(tempValue+"+");;
+                    }
+                }
+                /*String keyValueInfo = Arrays.stream(keyInfo.split("\\+"))
                         .map(key -> itemMap.get(key))
                         .filter(value-> value!= null)
-                        .collect(Collectors.joining("+"));
+                        .collect(Collectors.joining("+"));*/
+                String keyValueInfo = keyValueBuilder.toString();
                 logger.info("流水号规则的值："+keyValueInfo);
                 // 获取流水号规则
                 ReportfileSeqinfo reportfileSeqinfo = reportfileSeqinfoService.lambdaQuery()

src/main/java/com/gaotao/modules/print/service/impl/OutBoxPrintServiceImpl.java

@@ -119,12 +119,6 @@ public class OutBoxPrintServiceImpl implements OutBoxPrintService {
                 List<Reportcontentitem> reportcontentitemList = reportcontentitemService.getReportcontentitemList(reportFileVo.getReportId());
                 Map<String, String> 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<String, String> paramMap = outBoxParamVo.getParam().stream().collect(Collectors.toMap(ReportParametersEntity::getParametername, ReportParametersEntity::getOptionvalue));
                 Map<String, String> 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<String, Object> printOutMap = new HashMap<>();
                 int printQty = StringUtils.isNotEmpty(paramMap.get(OutBoxConstant.COPIES)) ? Integer.valueOf(paramMap.get(OutBoxConstant.COPIES)) : 1;

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<String, Object> resultMap = scheduleService.checkCreateSplitSfdcRoll(inData);
         return R.ok()