ubcs.git - Gitblit

			@@ -36,11 +36,15 @@
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.context.annotation.Lazy;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.TransactionStatus;
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.transaction.support.DefaultTransactionDefinition;
			import org.springframework.transaction.support.TransactionTemplate;
			import org.springframework.util.CollectionUtils;

			import javax.annotation.Resource;
			import java.util.*;
			import java.util.concurrent.CopyOnWriteArrayList;
			import java.util.concurrent.atomic.AtomicReference;
			import java.util.stream.Collectors;

			@@ -80,12 +84,16 @@
			@Autowired
			private FormulaServiceImpl formulaService;

			// 注入事务管理器
			// @Autowired
			// private TransactionTemplate transactionTemplate;

			@Override
			@Transactional(rollbackFor = VciBaseException.class)
			@Transactional(rollbackFor = Exception.class)
			public List<String> productCodeAndSaveData(CodeClassifyFullInfoBO classifyFullInfoBO, CodeClassifyTemplateVO templateVO, CodeRuleVO ruleVO, List<CodeOrderSecDTO> secDTOList, List<BaseModel> dataCBOList) throws Exception {
			dataCBOList = dataCBOList.stream().sorted(((o1, o2) -> o1.getCreateTime().compareTo(o2.getCreateTime()))).collect(Collectors.toList());
			List<String> codeList = new ArrayList<>();

			final CodeRuleVO finalRuleVO = ruleVO;
			/*****
			* 保证并发的时候，最大流水号都对的，但是这种加锁有弊端
			*/
			@@ -96,7 +104,7 @@
			//历史数据执行的时候，这个系统会很卡
			//主要是为了录入最大流水号和allcode
			//SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo();
			List<CodeAllCode> allCodeDOList = new ArrayList<>();
			List<CodeAllCode> allCodeDOList = new CopyOnWriteArrayList<>();
			Map<String/流水依据/, Map<String/码段的主键/,Double/最大流水号/>> maxSerialMap = new HashMap<>();
			// TODO 多线程流引发的问题已修改
			dataCBOList.parallelStream().forEach(cbo->{
			@@ -109,7 +117,7 @@
			cbo.getData().remove(CODE_SEC_LENGTH_FIELD);//将此key除去
			cbo.getData().remove(IMPORT_ROW_INDEX);//将此key除去
			cbo.getData().remove("codeclassifyid");//将此key除去
			List<CodeBasicSecVO> secVOList = ruleVO.getSecVOList().stream().sorted(((o1, o2) -> o1.getOrderNum().compareTo(o2.getOrderNum()))).collect(Collectors.toList());
			List<CodeBasicSecVO> secVOList = finalRuleVO.getSecVOList().stream().sorted(((o1, o2) -> o1.getOrderNum().compareTo(o2.getOrderNum()))).collect(Collectors.toList());
			Map<String/码段的主键/,String/码段的值/> serialValueMap = new HashMap<>();
			Map<String, CodeBasicSecVO> secVOMap = secVOList.stream().collect(Collectors.toMap(s -> s.getOid(), t -> t));
			for (int i = 0; i < secLengths.length; i++) {
			@@ -126,7 +134,7 @@
			start += VciBaseUtil.getInt(secLengths[j]);
			}
			thisSecValue = code.substring(start,start+VciBaseUtil.getInt(secLengths[i]));
			// }
			// }
			if(VciBaseUtil.getBoolean(secVO.getSerialDependFlag())){
			serialUnitList.add(thisSecValue);
			}
			@@ -141,13 +149,15 @@
			//要看是不是补位的
			CodeBasicSecVO secVO = secVOMap.get(secOid);
			Double serialDb = null;
			// 截取掉前后缀之后的码段
			String subSecValue = killPriffixSuffix(secValue, secVO.getPrefixCode(), secVO.getSuffixCode());
			if(OsCodeFillTypeEnum.NONE.getValue().equalsIgnoreCase(secVO.getCodeFillType())){
			//不补码
			//把所有不是数字的去掉，因为可能会是老数据，新规则
			serialDb = VciBaseUtil.getDouble(killUnNumberChar(secValue));
			serialDb = VciBaseUtil.getDouble(killUnNumberChar(subSecValue));
			}else {
			//左右填充的，我们需要
			serialDb = VciBaseUtil.getDouble(killUnNumberChar(killFillChar(secValue,secVO.getCodeFillSeparator(),
			serialDb = VciBaseUtil.getDouble(killUnNumberChar(killFillChar(subSecValue,secVO.getCodeFillSeparator(),
			OsCodeFillTypeEnum.LEFT.getValue().equalsIgnoreCase(secVO.getCodeFillType()))));
			}
			Map<String, Double> thisUnitMaxMap = maxSerialMap.getOrDefault(serialUnitString, new HashMap<>());
			@@ -166,7 +176,7 @@
			CodeAllCode allCodeDO = new CodeAllCode();
			DefaultAttrAssimtUtil.addDefaultAttrAssimt(allCodeDO, MdmBtmTypeConstant.CODE_ALL_CODE);
			allCodeDO.setCodeClassifyOid(classifyFullInfoBO.getCurrentClassifyVO().getOid());
			allCodeDO.setCodeRuleOid(ruleVO.getOid());
			allCodeDO.setCodeRuleOid(finalRuleVO.getOid());
			allCodeDO.setId(cbo.getId());
			allCodeDO.setCodeClassifyTemplateOid(templateVO.getOid());
			allCodeDO.setCreateCodeBtm(cbo.getBtmname());
			@@ -184,7 +194,7 @@
			maxSerialMap.forEach((serialUnit,secOidMaxMap)->{
			secOidMaxMap.forEach((secOid,maxSerial)->{
			QueryWrapper<CodeSerialValue> queryWrapper = new QueryWrapper<>();
			queryWrapper.eq("codeRuleOid", ruleVO.getOid());
			queryWrapper.eq("codeRuleOid", finalRuleVO.getOid());
			queryWrapper.eq("serialUnit", serialUnit);
			//这个字段是为了解决多个流水的问题
			queryWrapper.eq("codeSecOid", secOid);
			@@ -203,7 +213,7 @@
			//没有
			CodeSerialValue serialValueDO = new CodeSerialValue();
			DefaultAttrAssimtUtil.addDefaultAttrAssimt(serialValueDO, MdmBtmTypeConstant.CODE_SERIAL_VALUE);
			serialValueDO.setCodeRuleOid(ruleVO.getOid());
			serialValueDO.setCodeRuleOid(finalRuleVO.getOid());
			serialValueDO.setSerialUnit(serialUnit);
			serialValueDO.setCodeSecOid(secOid);
			serialValueDO.setMaxSerial(maxSerial.toString());
			@@ -262,6 +272,10 @@
			if(!CollectionUtils.isEmpty(editCodeDOs)){
			codeAllCodeService.updateBatchById(editCodeDOs);
			}
			// 获取事务定义
			//DefaultTransactionDefinition def = new DefaultTransactionDefinition();
			// 开始事务
			//TransactionStatus status = transactionTemplate.getTransactionManager().getTransaction(def);
			if(!CollectionUtils.isEmpty(addCodeDOs)){
			Map<String, String> statusMap = addCodeDOs.stream().collect(Collectors.toMap(s -> s.getOid(), s -> s.getLcStatus()));
			addCodeDOs.stream().filter(s -> StringUtils.equalsIgnoreCase("codeallcode",s.getBtmname())).forEach(s -> {
			@@ -300,13 +314,23 @@
			if(takeBack.size()>0){
			codeAllCodeService.updateBatchById(takeBack);
			}

			codeAllCodeService.saveBatch(addCodeDOs);
			}

			// try {
			mdmEngineService.insertBatchByType(dataCBOList.get(0).getBtmname(),dataCBOList);
			// 提交事务
			//transactionTemplate.getTransactionManager().commit(status);
			// }catch (Exception e){
			// // 出现异常时回滚事务
			// transactionTemplate.getTransactionManager().rollback(status);
			// }

			}
			return codeList;
			}else {
			List<CodeBasicSecVO> secVOList = ruleVO.getSecVOList().stream().sorted(((o1, o2) -> o1.getOrderNum().compareTo(o2.getOrderNum()))).collect(Collectors.toList());
			List<CodeBasicSecVO> secVOList = finalRuleVO.getSecVOList().stream().sorted(((o1, o2) -> o1.getOrderNum().compareTo(o2.getOrderNum()))).collect(Collectors.toList());
			List<String> serialUnitList = new LinkedList<>();
			List<String> secValueList = new ArrayList<>();
			Map<String, String> secValueMap = secDTOList.stream().collect(Collectors.toMap(s -> s.getSecOid(), s -> s.getSecValue()==null?"":s.getSecValue()));
			@@ -342,7 +366,7 @@
			switchAttrSecValue(attrSecVOList, cbo, thisSecValueList, attrSevIsSerialDepend, thisSerialUnitList);

			String serialUnitString = thisSerialUnitList.size() == 0 ? EMPTY_SERIAL_UNIT : thisSerialUnitList.stream().collect(Collectors.joining(SERIAL_UNIT_SPACE));
			switchSerialSecValue(serialSecVOList, attrSevIsSerialDepend, ruleVO, serialUnitString, maxSerialValueMap, thisSecValueList, lastMaxSerialValueMap, i == 0);
			switchSerialSecValue(serialSecVOList, attrSevIsSerialDepend, finalRuleVO, serialUnitString, maxSerialValueMap, thisSecValueList, lastMaxSerialValueMap, i == 0);

			//组装编码的值
			cbo.setId(thisSecValueList.stream().collect(Collectors.joining()));
			@@ -357,10 +381,10 @@
			}
			}
			//要存储最后的全部allcode
			wrapperAllCode(classifyFullInfoBO, ruleVO, cbo, templateVO, allCodeDOList, serialUnitString, sb.toString());
			wrapperAllCode(classifyFullInfoBO, finalRuleVO, cbo, templateVO, allCodeDOList, serialUnitString, sb.toString());
			}
			//处理最大流水
			saveSerialValue( ruleVO, lastMaxSerialValueMap, maxSerialValueMap);
			saveSerialValue( finalRuleVO, lastMaxSerialValueMap, maxSerialValueMap);

			allCodeDOList.stream().forEach(
			allCode -> {DefaultAttrAssimtUtil.addDefaultAttrAssimt(allCode,"codeallcode");allCode.setLctid("codeAllCodeLC");}
			@@ -461,7 +485,7 @@
			for (int j = 0; j < serialUnitList.size(); j++) {
			String secValue = serialUnitList.get(j);
			if (secValue.equalsIgnoreCase("${attr_" + attrSevVO.getOid() + "}")) {
			serialUnitList.set(j, value);
			serialUnitList.set(j, joinPreffixAndSuffix(attrSevVO,value));
			}
			}
			}
			@@ -805,6 +829,23 @@
			}

			/**
			* 去掉前后缀
			* @param secValue 字符
			* @param priffix 前缀
			* @param suffix 后缀
			* @return 替换后的值
			*/
			private String killPriffixSuffix(String secValue, String priffix,String suffix){
			if (priffix != null && secValue.startsWith(priffix)) {
			secValue = secValue.substring(priffix.length());
			}
			if (suffix != null && secValue.endsWith(suffix)) {
			secValue = secValue.substring(0, secValue.length() - suffix.length());
			}
			return secValue;
			}

			/**
			* 去除补位字符
			* @param s 字符
			* @param fillString 补位字符