ubcs.git - Gitblit

			@@ -2,7 +2,9 @@

			import com.alibaba.nacos.common.utils.StringUtils;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.vci.ubcs.code.algorithm.CustomSerialEnum;
			import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
			import com.vci.ubcs.code.dto.CodeCustomSerialDTO;
			import com.vci.ubcs.code.dto.CodeOrderSecDTO;
			import com.vci.ubcs.code.entity.CodeAllCode;
			import com.vci.ubcs.code.entity.CodeClassifyValue;
			@@ -29,6 +31,10 @@
			import com.vci.ubcs.starter.web.enumpck.OsCodeFillTypeEnum;
			import com.vci.ubcs.starter.web.util.VciBaseUtil;
			import com.vci.ubcs.starter.web.util.VciDateUtil;
			import lombok.extern.slf4j.Slf4j;
			import org.springblade.core.log.exception.ServiceException;
			import org.springblade.core.secure.utils.AuthUtil;
			import org.springblade.core.tool.utils.Func;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.context.annotation.Lazy;
			import org.springframework.stereotype.Service;
			@@ -36,12 +42,18 @@
			import org.springframework.util.CollectionUtils;

			import javax.annotation.Resource;
			import java.lang.reflect.InvocationTargetException;
			import java.lang.reflect.Method;
			import java.util.*;
			import java.util.concurrent.ConcurrentHashMap;
			import java.util.concurrent.CopyOnWriteArrayList;
			import java.util.concurrent.atomic.AtomicInteger;
			import java.util.concurrent.atomic.AtomicReference;
			import java.util.stream.Collectors;

			import static com.vci.ubcs.code.constant.MdmEngineConstant.*;
			@Service
			@Slf4j
			public class MdmProductCodeServiceImpl implements MdmProductCodeService {

			/**
			@@ -75,77 +87,113 @@
			@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;
			/*****
			* 保证并发的时候，最大流水号都对的，但是这种加锁有弊端
			*
			*/

			if(dataCBOList.stream().anyMatch(cbo-> StringUtils.isNotBlank(cbo.getId()))
			// && StringUtils.isNotBlank(cbo.getAttributeValue(CODE_SEC_LENGTH_FIELD))
			){
			// && StringUtils.isNotBlank(cbo.getAttributeValue(CODE_SEC_LENGTH_FIELD))
			){
			//是历史数据导入
			//历史数据执行的时候，这个系统会很卡
			//主要是为了录入最大流水号和allcode
			// SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo();
			List<CodeAllCode> allCodeDOList = new ArrayList<>();
			Map<String/流水依据/, Map<String/码段的主键/,Double/最大流水号/>> maxSerialMap = new HashMap<>();
			dataCBOList.stream().forEach(cbo->{
			// VciBaseUtil.setCurrentUserSessionInfo(sessionInfo);
			//SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo();
			List<CodeAllCode> allCodeDOList = new CopyOnWriteArrayList<>();
			Map<String/流水依据/, HashMap<String/码段的主键/,String/最大流水号/>> maxSerialMap = new HashMap<>();
			// TODO 多线程流引发的问题已修改
			dataCBOList.parallelStream().forEach(cbo->{
			log.info("code:----->"+cbo.getId());
			//VciBaseUtil.setCurrentUserSessionInfo(sessionInfo);
			String code = cbo.getId();
			List<String> serialUnitList = new ArrayList<>();
			String seclenghStr=cbo.getData().get(CODE_SEC_LENGTH_FIELD);
			String[] secLengths = cbo.getData().get(CODE_SEC_LENGTH_FIELD).split("#");
			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));
			Map<String,Integer> serialSecOidIndexMap=new HashMap<>();
			for (int i = 0; i < secLengths.length; i++) {
			CodeBasicSecVO secVO = secVOList.get(i);
			String thisSecValue = "";
			if(i == 0){
			thisSecValue = code.contains("#")?code.substring(0,code.indexOf("#")):code;
			/*if(i == 0){
			thisSecValue = seclenghStr.contains("#")?code.substring(0,VciBaseUtil.getInt(secLengths[i])):code;
			} else if(i == secLengths.length-1){
			//最后
			thisSecValue = code.contains("#")?code.substring(code.lastIndexOf("#")):code;
			}else {
			thisSecValue = seclenghStr.contains("#")?code.substring(VciBaseUtil.getInt(secLengths[i-1]),code.length()):code;
			}else {*/
			int start = 0;
			for (int j = 0; j < i; j++) {
			start += VciBaseUtil.getInt(secLengths[j]) + 1;
			start += VciBaseUtil.getInt(secLengths[j]);
			}
			thisSecValue = code.substring(start,start+VciBaseUtil.getInt(secLengths[1]));
			}
			thisSecValue = code.substring(start,start+VciBaseUtil.getInt(secLengths[i]));
			// }
			if(VciBaseUtil.getBoolean(secVO.getSerialDependFlag())){
			serialUnitList.add(thisSecValue);
			serialSecOidIndexMap.put(secVO.getOid(),i);
			}
			if(CodeSecTypeEnum.CODE_SERIAL_SEC.getValue().equalsIgnoreCase(secVO.getSecType())){
			serialValueMap.put(secVO.getOid(),thisSecValue);
			}
			}
			String serialUnitString = serialUnitList.size() == 0 ? EMPTY_SERIAL_UNIT : serialUnitList.stream().collect(Collectors.joining(SERIAL_UNIT_SPACE));
			List<String> serialUnFileStringList = new ArrayList<>();
			AtomicReference<String> newSerialUnitString = new AtomicReference<>("");
			if(!CollectionUtils.isEmpty(serialValueMap)){
			AtomicInteger index= new AtomicInteger();
			serialValueMap.forEach((secOid,secValue)->{
			//要看是不是补位的
			CodeBasicSecVO secVO = secVOMap.get(secOid);
			Double serialDb = null;
			List<String >newSerialUnitList=new ArrayList<>();
			newSerialUnitList.addAll(serialUnitList);
			if(index.get() ==0){
			if(serialSecOidIndexMap.containsKey(secOid)) {
			int num = serialSecOidIndexMap.get(secOid);
			newSerialUnitList.set(num, "");
			}
			}
			String serialUnitString = newSerialUnitList.size() == 0 ? EMPTY_SERIAL_UNIT : newSerialUnitList.stream().collect(Collectors.joining(SERIAL_UNIT_SPACE));
			newSerialUnitString.set(serialUnitString);
			index.getAndIncrement();
			String serialDb = "";
			// 截取掉前后缀之后的码段
			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));
			//serialDb = killUnNumberChar(subSecValue);
			serialDb=subSecValue;
			}else {
			//左右填充的，我们需要
			serialDb = VciBaseUtil.getDouble(killUnNumberChar(killFillChar(secValue,secVO.getCodeFillSeparator(),
			OsCodeFillTypeEnum.LEFT.getValue().equalsIgnoreCase(secVO.getCodeFillType()))));
			/*serialDb = VciBaseUtil.getDouble(killUnNumberChar(killFillChar(subSecValue,secVO.getCodeFillSeparator(),
			OsCodeFillTypeEnum.LEFT.getValue().equalsIgnoreCase(secVO.getCodeFillType()))));*/
			serialDb = killFillChar(subSecValue,secVO.getCodeFillSeparator(),
			OsCodeFillTypeEnum.LEFT.getValue().equalsIgnoreCase(secVO.getCodeFillType()));
			}
			Map<String, Double> thisUnitMaxMap = maxSerialMap.getOrDefault(serialUnitString, new HashMap<>());
			thisUnitMaxMap.put(secOid,serialDb);
			Double newSerialDb= CustomSerialEnum.getDoubleCustomSerialValue(secValue,secVO.getCustomCodeSerialType());
			HashMap<String, String> thisUnitMaxMap = maxSerialMap.getOrDefault(serialUnitString, new HashMap<>());
			Double maxValue=newSerialDb;
			if(thisUnitMaxMap.containsKey(secOid)){
			String newMaxValue= thisUnitMaxMap.getOrDefault(secOid,"");
			maxValue=StringUtils.isBlank(newMaxValue)?-1:VciBaseUtil.getDouble(newMaxValue);
			if(maxValue<newSerialDb){
			maxValue=newSerialDb;
			}
			}
			String newMaxValue=CustomSerialEnum.getStringCustomSerialValue(maxValue,secVO.getCustomCodeSerialType());
			serialDb=CustomSerialEnum.getStringCustomSerialValue(newSerialDb,secVO.getCustomCodeSerialType());
			thisUnitMaxMap.put(secOid,newMaxValue);
			maxSerialMap.put(serialUnitString,thisUnitMaxMap);
			serialUnFileStringList.add(String.valueOf(serialDb));
			});
			@@ -153,31 +201,35 @@
			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());
			allCodeDO.setCreateCodeOid(cbo.getOid());
			allCodeDO.setSerialUnit(serialUnitString);
			allCodeDO.setUnFillSerial(serialUnFileStringList.stream().collect(Collectors.joining(SERIAL_VALUE_SPACE)));
			allCodeDO.setSerialUnit(newSerialUnitString.get());
			String unFillSerial =serialUnFileStringList.size()==1?serialUnFileStringList.get(0)+ SERIAL_VALUE_SPACE:serialUnFileStringList.stream().collect(Collectors.joining(SERIAL_VALUE_SPACE));
			allCodeDO.setUnFillSerial(unFillSerial);
			allCodeDO.setLcStatus(cbo.getLcStatus());
			allCodeDOList.add(allCodeDO);
			});
			//处理最大的流水号
			List<CodeSerialValue> addSerialValueList = new ArrayList<>();
			List<CodeSerialValue> editSerialValueList = new ArrayList<>();
			log.info("maxSerialMap:----->"+maxSerialMap.size());
			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);

			List<CodeSerialValue> serialValueDOS = serialValueMapper.selectList(queryWrapper);
			log.info("serialValueDOS--->"+serialValueDOS.size());
			if (!CollectionUtils.isEmpty(serialValueDOS)) {
			CodeSerialValue serialValueDO = serialValueDOS.get(0);
			if(VciBaseUtil.getDouble(serialValueDO.getMaxSerial())<maxSerial){
			log.info("oldmaxSerial--->"+serialValueDO.getMaxSerial()+"---- newmaxSerial---->"+maxSerial);
			if(VciBaseUtil.getDouble(serialValueDO.getMaxSerial())<VciBaseUtil.getDouble(maxSerial)){
			serialValueDO.setMaxSerial(String.valueOf(maxSerial));
			DefaultAttrAssimtUtil.updateDefaultAttrAssimt(serialValueDO);
			editSerialValueList.add(serialValueDO);
			@@ -186,7 +238,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());
			@@ -206,6 +258,7 @@
			}
			//处理allCode
			if(!CollectionUtils.isEmpty(allCodeDOList)){
			// TODO 历史数据导入的时候这儿偶尔会触发空指针异常
			Map<String,List<CodeAllCode>> ruleGroup = allCodeDOList.stream().collect(Collectors.groupingBy(s -> s.getCodeRuleOid()));
			Map<String, CodeAllCode> codeDOMap = allCodeDOList.stream().collect(Collectors.toMap(s -> s.getCodeRuleOid() + "${SEP}" + s.getId(), t -> t));
			List<CodeAllCode> addCodeDOs = new ArrayList<>();
			@@ -244,6 +297,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 -> {
			@@ -257,13 +314,41 @@
			if( distinctCodeAllCOdes.size() != addCodeDOs.size() ){
			throw new VciBaseException("编码数据重复，无法保存，请注意！");
			}
			QueryWrapper<CodeAllCode> wrapper = new QueryWrapper<>();
			wrapper.eq("CREATECODEBTM",addCodeDOs.get(0).getCreateCodeBtm());
			wrapper.in("ID",addCodeDOs.stream().map(CodeAllCode::getId).collect(Collectors.toList()));
			List<CodeAllCode> codeAllCodes = codeAllCodeService.selectByWrapper(wrapper);
			List<CodeAllCode> takeBack = codeAllCodes.stream().filter(e -> e.getLcStatus().equals("TakeBack")).collect(Collectors.toList());
			if(codeAllCodes.size()>takeBack.size()){
			throw new ServiceException("生成编码数据ID已有历史记录,请确认如下生成的ID数据："+ codeAllCodes.stream().map(CodeAllCode::getId).collect(Collectors.toList()));
			}
			for (CodeAllCode codeAllCode : takeBack) {
			codeAllCode.setTs(new Date());
			codeAllCode.setLastModifyTime(new Date());
			codeAllCode.setLastModifier(AuthUtil.getUserId().toString());
			Iterator<CodeAllCode> iterator = addCodeDOs.iterator();
			while (iterator.hasNext()){
			CodeAllCode next = iterator.next();
			if(codeAllCode.getId().equals(next.getId())){
			codeAllCode.setCreateCodeOid(next.getCreateCodeOid());
			codeAllCode.setLcStatus(next.getLcStatus());
			iterator.remove();
			}
			}
			}
			if(takeBack.size()>0){
			codeAllCodeService.updateBatchById(takeBack);
			}

			codeAllCodeService.saveBatch(addCodeDOs);
			}

			// try {
			mdmEngineService.insertBatchByType(dataCBOList.get(0).getBtmname(),dataCBOList);
			}
			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()));
			@@ -274,7 +359,7 @@
			switchSecValue(secVO, secValueMap, classifyFullInfoBO, serialSecVOList, attrSecVOList, serialUnitList, secValueList);
			}
			//处理属性码段和流水码段
			Map<String/流水码段的主键/, Map<String/流水依据/, Double>> lastMaxSerialValueMap = new HashMap<>();
			Map<String/流水码段的主键/, Map<String/流水依据/, String>> lastMaxSerialValueMap = new HashMap<>();
			List<CodeAllCode> allCodeDOList = new ArrayList<>();

			//已经存储的最大流水号的内容
			@@ -299,7 +384,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(cbo,serialSecVOList, attrSevIsSerialDepend, finalRuleVO, serialUnitString, maxSerialValueMap, thisSecValueList, lastMaxSerialValueMap, i == 0);

			//组装编码的值
			cbo.setId(thisSecValueList.stream().collect(Collectors.joining()));
			@@ -308,39 +393,68 @@
			//把码段里面都找一下流水号
			for (int j = 0; j < serialSecVOList.size(); j++) {
			CodeBasicSecVO secVO = serialSecVOList.get(j);
			Double serialValue = lastMaxSerialValueMap.getOrDefault(secVO.getOid(), new HashMap<>()).getOrDefault(serialUnitString, 0d);
			String serialValue = lastMaxSerialValueMap.getOrDefault(secVO.getOid(), new HashMap<>()).getOrDefault(serialUnitString, "");
			if (serialValue != null) {
			sb.append(String.valueOf(serialValue.longValue())).append(SERIAL_VALUE_SPACE);
			sb.append(serialValue).append(SERIAL_VALUE_SPACE);
			}
			}
			//要存储最后的全部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");}
			);


			Map<String, String> statusMap = allCodeDOList.stream().collect(Collectors.toMap(s -> s.getOid(), s -> s.getLcStatus()));
			allCodeDOList.stream().filter(s -> StringUtils.equalsIgnoreCase("codeallcode",s.getBtmname())).forEach(s -> {
			allCodeDOList.stream().forEach(
			allCode -> {DefaultAttrAssimtUtil.addDefaultAttrAssimt(allCode,"codeallcode");allCode.setLctid("codeAllCodeLC");}
			);
			Map<String, String> statusMap = allCodeDOList.stream().collect(Collectors.toMap(s -> s.getOid(), s -> s.getLcStatus()));
			allCodeDOList.stream().filter(s -> StringUtils.equalsIgnoreCase("codeallcode",s.getBtmname())).forEach(s -> {
			s.setLcStatus(statusMap.get(s.getOid()));
			});
			});
			//通过ID来进行去重
			List<CodeAllCode> distinctCodeAllCOdes = allCodeDOList.stream().collect(Collectors
			.collectingAndThen(
			Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(CodeAllCode::getId))),
			ArrayList::new));
			if( distinctCodeAllCOdes.size() != allCodeDOList.size() ){
			throw new ServiceException("编码数据重复，无法保存，请注意！");
			}
			QueryWrapper<CodeAllCode> wrapper = new QueryWrapper<>();
			wrapper.eq("CREATECODEBTM",allCodeDOList.get(0).getCreateCodeBtm());
			wrapper.in("ID",allCodeDOList.stream().map(CodeAllCode::getId).collect(Collectors.toList()));
			List<CodeAllCode> codeAllCodes = codeAllCodeService.selectByWrapper(wrapper);
			List<CodeAllCode> takeBack = codeAllCodes.stream().filter(e -> e.getLcStatus().equals("TakeBack")).collect(Collectors.toList());
			if(codeAllCodes.size()>takeBack.size()){
			throw new ServiceException("生成编码数据ID已有历史记录,请确认如下生成的ID数据："+ codeAllCodes.stream().map(CodeAllCode::getId).collect(Collectors.toList()));
			}


			//通过ID来进行去重
			List<CodeAllCode> distinctCodeAllCOdes = allCodeDOList.stream().collect(Collectors
			.collectingAndThen(
			Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(CodeAllCode::getId))),
			ArrayList::new));
			if( distinctCodeAllCOdes.size() != allCodeDOList.size() ){
			throw new VciBaseException("编码数据重复，无法保存，请注意！");
			}
			codeAllCodeService.saveBatch(allCodeDOList);
			// iCodeWupinService.saveBatch(dataCBOList);
			mdmEngineService.insertBatchByType(dataCBOList.get(0).getBtmname(),dataCBOList);

			for (CodeAllCode codeAllCode : takeBack) {
			codeAllCode.setTs(new Date());
			codeAllCode.setLastModifyTime(new Date());
			codeAllCode.setLastModifier(AuthUtil.getUserId().toString());
			Iterator<CodeAllCode> iterator = allCodeDOList.iterator();
			while (iterator.hasNext()){
			CodeAllCode next = iterator.next();
			if(codeAllCode.getId().equals(next.getId())){
			codeAllCode.setCreateCodeOid(next.getCreateCodeOid());
			codeAllCode.setLcStatus(next.getLcStatus());
			iterator.remove();
			}
			}
			}
			mdmEngineService.insertBatchByType(dataCBOList.get(0).getBtmname(), dataCBOList);
			if(takeBack.size()>0){
			codeAllCodeService.updateBatchById(takeBack);
			}
			codeAllCodeService.saveBatch(allCodeDOList);
			// iCodeWupinService.saveBatch(dataCBOList);
			// 提交事务
			// transactionTemplate.getTransactionManager().commit(status);
			//}catch (Exception e){
			// 出现异常时回滚事务
			// transactionTemplate.getTransactionManager().rollback(status);
			// throw e;
			//}
			// batchCBO.getCreateCbos().stream().filter(s -> StringUtils.equalsIgnoreCase("codeallcode",s.getBtmName())).forEach(s -> {
			// s.setLcStatus(statusMap.get(s.getOid()));
			// try {
			@@ -350,10 +464,11 @@
			// }
			// });
			}
			// WebUtil.setPersistence(true);
			// boService.persistenceBatch(batchCBO);
			// WebUtil.setPersistence(true);
			// boService.persistenceBatch(batchCBO);
			return codeList;
			}

			/**
			* 转换属性码段的值
			* @param attrSecVOList 属性码段的显示对象
			@@ -382,7 +497,8 @@
			for (int j = 0; j < thisSecValueList.size(); j++) {
			String secValue = thisSecValueList.get(j);
			if (secValue.equalsIgnoreCase("${attr_" + attrSevVO.getOid() + "}")) {
			thisSecValueList.set(j, value);
			// TODO: 属性码段生成码值后，拼接前后缀
			thisSecValueList.set(j, joinPreffixAndSuffix(attrSevVO,value));
			}
			}
			if (attrSevIsSerialDepend) {
			@@ -390,14 +506,13 @@
			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));
			}
			}
			}
			});
			}
			}


			/**
			* 转换流水码段的值
			@@ -410,13 +525,27 @@
			* @param lastMaxSerialValueMap 封装后
			* @param firstData 是否为第一条数据
			*/
			private void switchSerialSecValue(List<CodeBasicSecVO> serialSecVOList,boolean attrSevIsSerialDepend,
			private void switchSerialSecValue(BaseModel cbo, List<CodeBasicSecVO> serialSecVOList,boolean attrSevIsSerialDepend,
			CodeRuleVO ruleVO,String serialUnitString,
			Map<String/码段的主键/,Map<String/流水依据/,CodeSerialValue>> maxSerialValueMap,List<String> thisSecValueList,
			Map<String/码段的主键/,Map<String/流水依据/, Double>> lastMaxSerialValueMap,boolean firstData){
			Map<String/码段的主键/,Map<String/流水依据/, String>> lastMaxSerialValueMap,boolean firstData){

			if (!CollectionUtils.isEmpty(serialSecVOList)) {
			Map<String,String> secIdserialValueMap=new LinkedHashMap<>();
			for (int j = 0; j < serialSecVOList.size(); j++) {
			CodeBasicSecVO secVO = serialSecVOList.get(j);
			String secVOValue="";
			AtomicReference<String> newSerialUnitString= new AtomicReference<>(serialUnitString);
			if(j==0){
			secVOValue="";
			newSerialUnitString.set(serialUnitString.replace("${" + secVO.getOid() + "}", secVOValue));
			}else{
			CodeBasicSecVO upSecVO =serialSecVOList.get(j-1);
			secIdserialValueMap.forEach((key,vaule)->{
			newSerialUnitString.set(serialUnitString.replace("${"+key+"}", vaule));
			});
			}

			if (attrSevIsSerialDepend \|\| firstData) {
			//如果属性码段也是依赖，则每次都要查询，如果属性码段不是依赖，则只查询一次
			// Map<String, String> conditionMap = new HashMap<>();
			@@ -425,8 +554,9 @@
			// //这个字段是为了解决多个流水的问题
			// conditionMap.put("codeSecOid", secVO.getOid());
			QueryWrapper<CodeSerialValue> codeSerialWrapper = new QueryWrapper<>();

			codeSerialWrapper.eq("codeRuleOid", ruleVO.getOid());
			codeSerialWrapper.eq("serialUnit", serialUnitString);
			codeSerialWrapper.eq("serialUnit", newSerialUnitString.get());
			codeSerialWrapper.eq("codeSecOid", secVO.getOid());
			List<CodeSerialValue> serialValueDOS = serialValueMapper.selectList(codeSerialWrapper);
			if (!CollectionUtils.isEmpty(serialValueDOS)) {
			@@ -436,25 +566,41 @@
			maxSerialValueMap.put(secVO.getOid(), unitSerialMap);
			}
			}
			Double startValue = null;
			if(maxSerialValueMap.containsKey(secVO.getOid()) && maxSerialValueMap.get(secVO.getOid()).containsKey(serialUnitString)){
			startValue = VciBaseUtil.getDouble(maxSerialValueMap.get(secVO.getOid()).get(serialUnitString).getMaxSerial());
			String serialString="";
			String thisSerialValue = "";
			String startValue = null;
			if (maxSerialValueMap.containsKey(secVO.getOid()) && maxSerialValueMap.get(secVO.getOid()).containsKey(newSerialUnitString.get())) {
			startValue = maxSerialValueMap.get(secVO.getOid()).get(newSerialUnitString.get()).getMaxSerial();
			}
			if(lastMaxSerialValueMap.containsKey(secVO.getOid()) && lastMaxSerialValueMap.get(secVO.getOid()).containsKey(serialUnitString)){
			if (lastMaxSerialValueMap.containsKey(secVO.getOid()) && lastMaxSerialValueMap.get(secVO.getOid()).containsKey(newSerialUnitString.get())) {
			//说明多个申请，之前已经加了流水号了
			startValue = lastMaxSerialValueMap.get(secVO.getOid()).get(serialUnitString);
			startValue = lastMaxSerialValueMap.get(secVO.getOid()).get(newSerialUnitString.get());
			}
			Double thisSerialValue = 0d;
			if (startValue == null) {
			//第一个编码
			thisSerialValue = VciBaseUtil.getDouble(secVO.getSerialStart());
			} else {
			//流水号肯定是数字
			thisSerialValue = startValue + (j + 1) * secVO.getSerialStep();
			}
			//要看是否超过最大的流水值
			if (thisSerialValue >= secVO.getCodeFillLimit()) {
			throw new VciBaseException("流水号已经超过允许的最大流水值{0}",new String[]{secVO.getCodeFillLimit().toString()});
			if(StringUtils.isNotBlank(secVO.getCustomCodeSerialClass())){//自定义流水处理
			String currentFlowValue=startValue;
			CodeCustomSerialDTO codeCustomSerialDTO=new CodeCustomSerialDTO();
			codeCustomSerialDTO.setSerialUnitString(newSerialUnitString.get());
			codeCustomSerialDTO.setSerialCodeCodeBasicSec(secVO);
			codeCustomSerialDTO.setCurrentFlowValue(startValue);
			codeCustomSerialDTO.setCodeBasicSecVOList(ruleVO.getSecVOList());
			codeCustomSerialDTO.setCodeRuleOid(ruleVO.getOid());
			codeCustomSerialDTO.setBaseModel(cbo);
			thisSerialValue=customCodeSerial(secVO.getCustomCodeSerialClass(),codeCustomSerialDTO);
			log.info(secVO.getCustomCodeSerialClassText()+"---->"+thisSerialValue);
			}else {
			Double newThisSerialValue = 0d;
			if (startValue == null) {
			//第一个编码
			newThisSerialValue = VciBaseUtil.getDouble(secVO.getSerialStart());
			} else {
			//流水号肯定是数字
			newThisSerialValue = Double.parseDouble(startValue) + (j + 1) * secVO.getSerialStep();
			}
			//要看是否超过最大的流水值
			if (newThisSerialValue >= secVO.getCodeFillLimit()) {
			throw new VciBaseException("流水号已经超过允许的最大流水值{0}", new String[]{secVO.getCodeFillLimit().toString()});
			}
			thisSerialValue=String.valueOf(newThisSerialValue.intValue());
			}
			//要看补位的内容
			Integer fillLength = VciBaseUtil.getInt(secVO.getCodeFillLength());
			@@ -462,21 +608,46 @@
			//防止在添加的地方没有控制正确
			fillLength = VciBaseUtil.getInt(secVO.getCodeSecLength());
			}
			String serialString = String.valueOf(thisSerialValue.longValue());
			serialString = thisSerialValue;
			serialString = fillString(fillLength, OsCodeFillTypeEnum.forValue(secVO.getCodeFillType()), serialString, secVO.getCodeFillSeparator());

			for (int z = 0; z < thisSecValueList.size(); z++) {
			String secValue = thisSecValueList.get(z);
			if (secValue.equalsIgnoreCase("${" + secVO.getOid() + "}")) {
			thisSecValueList.set(z, serialString);
			// TODO: 流水生成码值后拼接前后缀
			thisSecValueList.set(z, joinPreffixAndSuffix(secVO, serialString));
			}
			}
			Map<String, Double> unitSerialMap = lastMaxSerialValueMap.getOrDefault(secVO.getOid(), new HashMap<>());
			unitSerialMap.put(serialUnitString, thisSerialValue);
			secIdserialValueMap.put(secVO.getOid(),thisSerialValue);//记录流水码段当前的值
			Map<String, String> unitSerialMap = lastMaxSerialValueMap.getOrDefault(secVO.getOid(), new HashMap<>());
			unitSerialMap.put(newSerialUnitString.get(), String.valueOf(thisSerialValue));
			lastMaxSerialValueMap.put(secVO.getOid(),unitSerialMap);
			}
			}
			}

			private String customCodeSerial(String className, CodeCustomSerialDTO codeCustomSerialDTO){
			String result = "";
			try {
			Class classInstance=Class.forName(className);
			Object obj =classInstance.newInstance();
			Method method= classInstance.getMethod("serialGenerate",CodeCustomSerialDTO.class);
			method.setAccessible(Boolean.TRUE);
			//method.invoke(obj);
			Object o= method.invoke(obj,codeCustomSerialDTO);
			result= Func.isEmpty(o) ?"":o.toString();
			} catch (ClassNotFoundException e) {
			throw new VciBaseException("未找到自定义流水算法类文件");
			} catch (InvocationTargetException e) {
			throw new VciBaseException("执行自定义流水算法处理方法出现异常");
			} catch (NoSuchMethodException e) {
			throw new VciBaseException("未找到自定义流水算法处理方法");
			} catch (IllegalAccessException e) {
			throw new VciBaseException("执行自定义流水算法处理方法出现异常");
			} catch (InstantiationException e) {
			e.printStackTrace();
			}
			return result;
			}
			/**
			* 转换码值的内容
			* @param secVO 码段的内容
			@@ -495,18 +666,19 @@
			String secValue = secValueMap.getOrDefault(secVO.getOid(), "");
			switch (secType) {
			case CODE_FIXED_SEC:
			secValue = joinPreffixAndSuffix(secVO, secValue);
			//固定码段的，直接用码值,不论码值的长度是多少，因为可变长度和固定长度是控制在码段管理里面的码值定义的
			break;
			case CODE_DATE_SEC:
			//时间码段，需要将当前时间依据时间格式进行转换.
			//时间码段不涉及到是否补位
			secValue = VciDateUtil.date2Str(new Date(), secVO.getCodeDateFormatStr());
			secValue =joinPreffixAndSuffix(secVO, VciDateUtil.date2Str(new Date(), secVO.getCodeDateFormatStr()));
			break;
			case CODE_CLASSIFY_SEC:
			//分类码段的，也是从前端选择了码值即可，不论码值的长度是多少
			CodeClassifyValue codeClassifyValueDO= codeClassifyValueMapper.selectById(secValue);
			if(codeClassifyValueDO!=null) {
			secValue = codeClassifyValueDO.getId();
			secValue = joinPreffixAndSuffix(secVO, codeClassifyValueDO.getId());
			}
			break;
			case CODE_LEVEL_SEC:
			@@ -559,10 +731,12 @@
			secValue = secValue.substring(secValue.length() - secVO.getValueCutLength());
			}
			}
			secValue = joinPreffixAndSuffix(secVO,secValue);
			break;
			case CODE_REFER_SEC:
			//引用的在页面上已经选择了，所以直接使用前端上传递的值
			//引用就是参照，可能是其他的分类（业务类型）下的数据，所以只在页面上选择
			secValue = joinPreffixAndSuffix(secVO,secValue);
			break;
			case CODE_ATTR_SEC:
			//属性与引用的区别是，属性是当前数据里的属性，而引用可能是引用其他的分类的（业务类型）
			@@ -577,6 +751,7 @@
			}
			OsCodeFillTypeEnum fillTypeEnum = OsCodeFillTypeEnum.forValue(secVO.getCodeFillType());
			secValue = fillString(VciBaseUtil.getInt(secVO.getCodeSecLength()), fillTypeEnum, secValue, secVO.getCodeFillSeparator());
			secValue = joinPreffixAndSuffix(secVO,secValue);
			break;
			case CODE_SERIAL_SEC:
			//流水码段
			@@ -589,6 +764,27 @@
			serialUnitList.add(secValue);
			}
			secValueList.add(secValue);
			}

			/**
			* 拼接前后缀
			* @param secVO
			* @param secValue
			* @return
			*/
			private String joinPreffixAndSuffix(CodeBasicSecVO secVO, String secValue){
			StringBuilder joinSecValue = new StringBuilder();
			// 拼接前缀
			if (Func.isNotEmpty(secVO.getPrefixCode())) {
			joinSecValue = joinSecValue.append(secVO.getPrefixCode());
			}
			// 在中间拼接值
			joinSecValue.append(secValue);
			// 拼接后缀
			if(Func.isNotEmpty(secVO.getSuffixCode())){
			joinSecValue = joinSecValue.append(secVO.getSuffixCode());
			}
			return joinSecValue.toString();
			}

			/**
			@@ -642,9 +838,6 @@
			allCodeDOList.add(allCodeDO);
			}




			/**
			* 保存流水的信息
			* @param ruleVO 规则的显示对象
			@@ -652,7 +845,7 @@
			* @param maxSerialValueMap 依据存储的最大流水的内容
			*/
			private void saveSerialValue(CodeRuleVO ruleVO,
			Map<String/码段的主键/,Map<String, Double>> lastMaxSerialValueMap,
			Map<String/码段的主键/,Map<String, String>> lastMaxSerialValueMap,
			Map<String/码段的主键/,Map<String, CodeSerialValue>> maxSerialValueMap){
			List<CodeSerialValue> editSerialValueDOList = new ArrayList<>();
			List<CodeSerialValue> addSerialValueDOList = new ArrayList<>();
			@@ -712,6 +905,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 补位字符
			@@ -721,12 +931,14 @@
			private String killFillChar(String s, String fillString,boolean left){
			Integer index = 0;
			String value = s;

			if(left){
			for (int i = 0; i < s.length(); i++) {
			char c = s.charAt(i);
			if((new String(new char[]{c})).equalsIgnoreCase(fillString)){
			index = i;
			if(!(new String(new char[]{c})).equalsIgnoreCase(fillString)){
			break;
			}
			index = i;
			}
			if(index >0){
			value = value.substring(index);
			@@ -735,9 +947,10 @@
			//从右往左找
			for (int i = s.length()-1; i >=0; i++) {
			char c = s.charAt(i);
			if((new String(new char[]{c})).equalsIgnoreCase(fillString)){
			index = i;
			if(!(new String(new char[]{c})).equalsIgnoreCase(fillString)){
			break;
			}
			index = i;
			}
			if(index >0){
			value = value.substring(0,index);
			@@ -805,4 +1018,5 @@
			// WebUtil.copyValueToMapFromCbos(cbo,dataMap);
			return formulaService.getValueByFormula(map,rule);
			}

			}