From 111330b2dd0bccc176ab9c6324a6ed01d5bc0e93 Mon Sep 17 00:00:00 2001 From: xiejun <xj@2023> Date: 星期四, 12 十月 2023 09:48:03 +0800 Subject: [PATCH] 历史导入编码最大流水值不正确问题修复 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java | 127 +++++++++++++++++++++++++++-------------- 1 files changed, 83 insertions(+), 44 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java index f199450..cf29925 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java @@ -2,18 +2,18 @@ import com.alibaba.nacos.common.utils.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.BeanUtils; import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO; import com.vci.ubcs.code.dto.CodeOrderSecDTO; import com.vci.ubcs.code.entity.CodeAllCode; +import com.vci.ubcs.code.entity.CodeClassifyValue; import com.vci.ubcs.code.entity.CodeSerialValue; import com.vci.ubcs.code.enumpack.CodeCutTypeEnum; import com.vci.ubcs.code.enumpack.CodeGetValueTypeEnum; import com.vci.ubcs.code.enumpack.CodeLevelTypeEnum; import com.vci.ubcs.code.enumpack.CodeSecTypeEnum; import com.vci.ubcs.code.lifecycle.CodeAllCodeLC; +import com.vci.ubcs.code.mapper.CodeClassifyValueMapper; import com.vci.ubcs.code.mapper.CodeSerialValueMapper; -import com.vci.ubcs.code.service.ICodeWupinService; import com.vci.ubcs.code.service.MdmEngineService; import com.vci.ubcs.code.service.MdmProductCodeService; import com.vci.ubcs.code.vo.pagemodel.CodeBasicSecVO; @@ -23,14 +23,17 @@ import com.vci.ubcs.starter.exception.VciBaseException; import com.vci.ubcs.starter.revision.model.BaseModel; import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil; +import com.vci.ubcs.starter.util.MdmBtmTypeConstant; import com.vci.ubcs.starter.web.constant.QueryOptionConstant; import com.vci.ubcs.starter.web.constant.RegExpConstant; 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.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; @@ -40,6 +43,7 @@ import static com.vci.ubcs.code.constant.MdmEngineConstant.*; @Service +@Slf4j public class MdmProductCodeServiceImpl implements MdmProductCodeService { /** @@ -49,16 +53,17 @@ private CodeSerialValueMapper serialValueMapper; /** - * 鎵�鏈夌殑缂栫爜鐨勫唴瀹� + * 娴佹按鍙风殑鐩稿叧鐨勪俊鎭� */ @Resource - private CodeAllCodeServiceImpl codeAllCodeService; + private CodeClassifyValueMapper codeClassifyValueMapper; /** * 鎵�鏈夌殑缂栫爜鐨勫唴瀹� */ @Resource - private ICodeWupinService iCodeWupinService; + private CodeAllCodeServiceImpl codeAllCodeService; + /** * 鎵�鏈夌殑缂栫爜鐨勫唴瀹� */ @@ -73,11 +78,9 @@ private FormulaServiceImpl formulaService; @Override + @Transactional(rollbackFor = VciBaseException.class) public List<String> productCodeAndSaveData(CodeClassifyFullInfoBO classifyFullInfoBO, CodeClassifyTemplateVO templateVO, CodeRuleVO ruleVO, List<CodeOrderSecDTO> secDTOList, List<BaseModel> dataCBOList) throws Exception { -// BatchCBO batchCBO = new BatchCBO(); -// WebUtil.setPersistence(false); dataCBOList = dataCBOList.stream().sorted(((o1, o2) -> o1.getCreateTime().compareTo(o2.getCreateTime()))).collect(Collectors.toList()); -// batchCBO.getCreateCbos().addAll(dataCBOList); List<String> codeList = new ArrayList<>(); /***** @@ -94,29 +97,35 @@ // SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo(); List<CodeAllCode> allCodeDOList = new ArrayList<>(); Map<String/**娴佹按渚濇嵁**/, Map<String/**鐮佹鐨勪富閿�**/,Double/**鏈�澶ф祦姘村彿**/>> 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()); 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++) { 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); } @@ -141,12 +150,19 @@ OsCodeFillTypeEnum.LEFT.getValue().equalsIgnoreCase(secVO.getCodeFillType())))); } Map<String, Double> thisUnitMaxMap = maxSerialMap.getOrDefault(serialUnitString, new HashMap<>()); + if(thisUnitMaxMap.containsKey(secOid)){ + Double maxValue= thisUnitMaxMap.getOrDefault(secOid,new Double(-1)); + if(maxValue>serialDb){ + serialDb=maxValue; + } + } thisUnitMaxMap.put(secOid,serialDb); maxSerialMap.put(serialUnitString,thisUnitMaxMap); serialUnFileStringList.add(String.valueOf(serialDb)); }); } CodeAllCode allCodeDO = new CodeAllCode(); + DefaultAttrAssimtUtil.addDefaultAttrAssimt(allCodeDO, MdmBtmTypeConstant.CODE_ALL_CODE); allCodeDO.setCodeClassifyOid(classifyFullInfoBO.getCurrentClassifyVO().getOid()); allCodeDO.setCodeRuleOid(ruleVO.getOid()); allCodeDO.setId(cbo.getId()); @@ -161,29 +177,29 @@ //澶勭悊鏈�澶х殑娴佹按鍙� List<CodeSerialValue> addSerialValueList = new ArrayList<>(); List<CodeSerialValue> editSerialValueList = new ArrayList<>(); + log.info("maxSerialMap:----->"+maxSerialMap.size()); maxSerialMap.forEach((serialUnit,secOidMaxMap)->{ secOidMaxMap.forEach((secOid,maxSerial)->{ -// Map<String, String> conditionMap = new HashMap<>(); -// conditionMap.put("codeRuleOid", ruleVO.getOid()); -// conditionMap.put("serialUnit", serialUnit); -// //杩欎釜瀛楁鏄负浜嗚В鍐冲涓祦姘寸殑闂 -// conditionMap.put("codeSecOid", secOid); QueryWrapper<CodeSerialValue> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("codeRuleOid", ruleVO.getOid()); queryWrapper.eq("serialUnit", serialUnit); + //杩欎釜瀛楁鏄负浜嗚В鍐冲涓祦姘寸殑闂 queryWrapper.eq("codeSecOid", secOid); List<CodeSerialValue> serialValueDOS = serialValueMapper.selectList(queryWrapper); -// .selectByCondition(conditionMap, new PageHelper(-1)); + log.info("serialValueDOS--->"+serialValueDOS.size()); if (!CollectionUtils.isEmpty(serialValueDOS)) { CodeSerialValue serialValueDO = serialValueDOS.get(0); + log.info("oldmaxSerial--->"+serialValueDO.getMaxSerial()+"---- newmaxSerial---->"+maxSerial); if(VciBaseUtil.getDouble(serialValueDO.getMaxSerial())<maxSerial){ serialValueDO.setMaxSerial(String.valueOf(maxSerial)); + DefaultAttrAssimtUtil.updateDefaultAttrAssimt(serialValueDO); editSerialValueList.add(serialValueDO); } }else{ //娌℃湁 CodeSerialValue serialValueDO = new CodeSerialValue(); + DefaultAttrAssimtUtil.addDefaultAttrAssimt(serialValueDO, MdmBtmTypeConstant.CODE_SERIAL_VALUE); serialValueDO.setCodeRuleOid(ruleVO.getOid()); serialValueDO.setSerialUnit(serialUnit); serialValueDO.setCodeSecOid(secOid); @@ -193,31 +209,24 @@ }); }); if(!CollectionUtils.isEmpty(addSerialValueList)){ -// batchCBO.copyFromOther(serialValueMapper.batchInsert(addSerialValueList)); for (CodeSerialValue codeSerialValue : addSerialValueList) { serialValueMapper.insert(codeSerialValue); } -// serialValueMapper.ba - } if(!CollectionUtils.isEmpty(editSerialValueList)){ for (CodeSerialValue codeSerialValue : editSerialValueList) { serialValueMapper.updateById(codeSerialValue); } - -// batchCBO.copyFromOther(serialValueMapper.batchUpdate(editSerialValueList)); } //澶勭悊allCode if(!CollectionUtils.isEmpty(allCodeDOList)){ - Map<String, List<CodeAllCode>> ruleGroup = allCodeDOList.stream().collect(Collectors.groupingBy(s -> s.getCodeRuleOid())); + // 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<>(); List<CodeAllCode> editCodeDOs = new ArrayList<>(); ruleGroup.forEach((ruleOid,allCodeDOS)->{ VciBaseUtil.switchCollectionForOracleIn(allCodeDOS).stream().forEach(codeDOs->{ -// Map<String,String> conditionMap = new HashMap<>(); -// conditionMap.put("coderuleoid",ruleOid); -// conditionMap.put("id",QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(codeDOs.stream().map(s->s.getId()).collect(Collectors.toList()).toArray(new String[0])) + ")"); QueryWrapper<CodeAllCode> allCodeWrapper = new QueryWrapper<>(); allCodeWrapper.eq("coderuleoid",ruleOid); allCodeWrapper.in("id", QueryOptionConstant.IN + "(" + @@ -248,26 +257,31 @@ addCodeDOs = allCodeDOList; } if(!CollectionUtils.isEmpty(editCodeDOs)){ -// batchCBO.copyFromOther(allCodeMapper.batchUpdate(editCodeDOs)); codeAllCodeService.updateBatchById(editCodeDOs); } if(!CollectionUtils.isEmpty(addCodeDOs)){ -// batchCBO.copyFromOther(allCodeMapper.batchInsert(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 -> { s.setLcStatus(statusMap.get(s.getOid())); }); + //閫氳繃ID鏉ヨ繘琛屽幓閲� + List<CodeAllCode> distinctCodeAllCOdes = addCodeDOs.stream().collect(Collectors + .collectingAndThen( + Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(CodeAllCode::getId))), + ArrayList::new)); + if( distinctCodeAllCOdes.size() != addCodeDOs.size() ){ + throw new VciBaseException("缂栫爜鏁版嵁閲嶅锛屾棤娉曚繚瀛橈紝璇锋敞鎰忥紒"); + } codeAllCodeService.saveBatch(addCodeDOs); } + mdmEngineService.insertBatchByType(dataCBOList.get(0).getBtmname(),dataCBOList); } -// WebUtil.setPersistence(true); -// boService.persistenceBatch(batchCBO); return codeList; }else { List<CodeBasicSecVO> secVOList = ruleVO.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())); + Map<String, String> secValueMap = secDTOList.stream().collect(Collectors.toMap(s -> s.getSecOid(), s -> s.getSecValue()==null?"":s.getSecValue())); List<CodeBasicSecVO> serialSecVOList = new ArrayList<>(); List<CodeBasicSecVO> attrSecVOList = new ArrayList<>(); for (int i = 0; i < secVOList.size(); i++) { @@ -283,6 +297,9 @@ for (int i = 0; i < dataCBOList.size(); i++) { BaseModel cbo = dataCBOList.get(i); + cbo.getData().remove(CODE_SEC_LENGTH_FIELD);//灏嗘key闄ゅ幓 + cbo.getData().remove(IMPORT_ROW_INDEX);//灏嗘key闄ゅ幓 + cbo.getData().remove("codeclassifyid");//灏嗘key闄ゅ幓 List<String> thisSecValueList = new LinkedList<>(); for (int j = 0; j < secValueList.size(); j++) { thisSecValueList.add(secValueList.get(j)); @@ -314,7 +331,13 @@ //瑕佸瓨鍌ㄦ渶鍚庣殑鍏ㄩ儴allcode wrapperAllCode(classifyFullInfoBO, ruleVO, cbo, templateVO, allCodeDOList, serialUnitString, sb.toString()); } + //澶勭悊鏈�澶ф祦姘� saveSerialValue( ruleVO, 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 -> { @@ -322,10 +345,14 @@ }); - allCodeDOList.stream().forEach( - allCode -> {DefaultAttrAssimtUtil.addDefaultAttrAssimt(allCode,"codeallcode");allCode.setLctid("codeAllCodeLC");} - ); - + //閫氳繃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); @@ -493,6 +520,10 @@ break; case CODE_CLASSIFY_SEC: //鍒嗙被鐮佹鐨勶紝涔熸槸浠庡墠绔�夋嫨浜嗙爜鍊煎嵆鍙紝涓嶈鐮佸�肩殑闀垮害鏄灏� + CodeClassifyValue codeClassifyValueDO= codeClassifyValueMapper.selectById(secValue); + if(codeClassifyValueDO!=null) { + secValue = codeClassifyValueDO.getId(); + } break; case CODE_LEVEL_SEC: //灞傜骇鐮佹锛岄渶瑕佷粠鍒嗙被涓婅幏鍙栫浉搴旂殑淇℃伅 @@ -503,7 +534,7 @@ secValue = classifyFullInfoBO.getCurrentClassifyVO().getId(); } else { //鎴戜滑闇�瑕佷粠椤跺眰寮�濮嬫壘鍒板綋鍓嶅垎绫讳负姝� - secValue = classifyFullInfoBO.getParentClassifyVOs().stream().sorted(((o1, o2) -> o1.getDataLevel().compareTo(o2.getDataLevel()))).map(CodeClassifyVO::getId).collect(Collectors.joining()) + classifyFullInfoBO.getCurrentClassifyVO().getId(); + secValue = classifyFullInfoBO.getParentClassifyVOs().stream().sorted(((o1, o2) -> -o1.getDataLevel().compareTo(o2.getDataLevel()))).map(CodeClassifyVO::getId).collect(Collectors.joining()) + classifyFullInfoBO.getCurrentClassifyVO().getId(); } } else { //鎸囧畾灞傦紝鎴戜滑闇�瑕侀�氳繃涓婄骇鐨勬潵鑾峰彇 @@ -512,7 +543,7 @@ secValue = classifyFullInfoBO.getCurrentClassifyVO().getId(); } else { //杩欎釜鎴戜滑闇�瑕佺湅鐪�,灞傜骇鏄笉鏄ぇ浜庝簡鏈�澶у眰绾х殑鏁� - List<CodeClassifyVO> parentClassifyVOList = classifyFullInfoBO.getParentClassifyVOs().stream().sorted(((o1, o2) -> o1.getDataLevel().compareTo(o2.getDataLevel()))).collect(Collectors.toList()); + List<CodeClassifyVO> parentClassifyVOList = classifyFullInfoBO.getParentClassifyVOs().stream().sorted(((o1, o2) -> -o1.getDataLevel().compareTo(o2.getDataLevel()))).collect(Collectors.toList()); if (secVO.getCodeLevelValue() > (parentClassifyVOList.size() + 1)) { //鎸囧畾鐨勫眰绾ф瘮褰撳墠鐨勫眰绾ц繕澶т簡锛屾墍浠ュ彧鑳借幏鍙栧綋鍓嶅眰绾т簡 if (CodeGetValueTypeEnum.CURRENT.getValue().equalsIgnoreCase(secVO.getCodeGetValueType())) { @@ -529,7 +560,7 @@ } } else { //灏忎簬绛変簬鐨勫叏閮ㄦ嬁鍑烘潵 - secValue = parentClassifyVOList.stream().filter(s -> s.getDataLevel().intValue() <= secVO.getCodeLevelValue().intValue()).sorted(((o1, o2) -> o1.getDataLevel().compareTo(o2.getDataLevel()))).map(CodeClassifyVO::getId).collect(Collectors.joining()); + secValue = parentClassifyVOList.stream().filter(s -> s.getDataLevel().intValue() <= secVO.getCodeLevelValue().intValue()).sorted(((o1, o2) -> -o1.getDataLevel().compareTo(o2.getDataLevel()))).map(CodeClassifyVO::getId).collect(Collectors.joining()); } } } @@ -614,6 +645,7 @@ BaseModel cbo, CodeClassifyTemplateVO templateVO, List<CodeAllCode> allCodeDOList, String serialUnitString, String serialValueString){ CodeAllCode allCodeDO = new CodeAllCode(); + DefaultAttrAssimtUtil.addDefaultAttrAssimt(allCodeDO, MdmBtmTypeConstant.CODE_ALL_CODE); allCodeDO.setCodeClassifyOid(classifyFullInfoBO.getCurrentClassifyVO().getOid()); allCodeDO.setCodeRuleOid(ruleVO.getOid()); allCodeDO.setId(cbo.getId()); @@ -648,9 +680,11 @@ //璇存槑鏈� serialValueDO = maxSerialValueMap.get(secOid).get(unit); serialValueDO.setMaxSerial(maxSerial.toString()); + DefaultAttrAssimtUtil.updateDefaultAttrAssimt(serialValueDO); editSerialValueDOList.add(serialValueDO); }else{ serialValueDO = new CodeSerialValue(); + DefaultAttrAssimtUtil.addDefaultAttrAssimt(serialValueDO, MdmBtmTypeConstant.CODE_SERIAL_VALUE); serialValueDO.setCodeRuleOid(ruleVO.getOid()); serialValueDO.setSerialUnit(unit); serialValueDO.setCodeSecOid(secOid); @@ -773,8 +807,13 @@ * @param rule 瑙勫垯鐨勫唴瀹� * @return 杞崲鍚庣殑 */ - private String getValueByFormulaForCBO(BaseModel cbo,String rule){ - Map<String, Object> dataMap = BeanUtils.beanToMap(cbo); + private String getValueByFormulaForCBO(BaseModel cbo,String rule) { + Map<String, Object> dataMap = null; + try{ + dataMap = VciBaseUtil.convertBean2Map(cbo,null); + }catch(Exception e){ + throw new VciBaseException("mapToBeanError:"+e); + } Map<String, String> map = new HashMap<String, String>(); for (String i : dataMap.keySet()) { map.put(i, String.valueOf(dataMap.get(i))); -- Gitblit v1.9.3