From d95fe0fa9cb944a81201c10bd3606ba8b61af750 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期二, 05 十二月 2023 16:06:54 +0800 Subject: [PATCH] 赋默认值工具类修改,根据多线程流情况修改 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeButtonServiceImpl.java | 4 ++-- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeApplyWebManagementServiceImpl.java | 2 +- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java | 12 ++++++------ Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyValueServiceImpl.java | 4 ++-- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java | 2 +- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateButtonServiceImpl.java | 4 ++-- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeFixedValueServiceImpl.java | 4 ++-- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferConfigServiceImpl.java | 2 +- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java | 4 ++-- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 4 ++-- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeApplyWebManagementServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeApplyWebManagementServiceImpl.java index a0be413..5bab4a3 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeApplyWebManagementServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeApplyWebManagementServiceImpl.java @@ -63,7 +63,7 @@ //澶勭悊鏂伴�夋嫨鐨勬暟鎹� roleList.stream().forEach(systemClassifyRole -> { if(StringUtil.isBlank(systemClassifyRole.getOid())){ - DefaultAttrAssimtUtil.addDefaultAttrAssimt(systemClassifyRole,"systemClassifyRole"); + DefaultAttrAssimtUtil.addDefaultAttrAssimt(systemClassifyRole,"systemClassifyRole",null); systemClassifyRole.setSystemId(systemId); systemClassifyRole.setSystemOid(systemOid); systemClassifyRole.setTenantId(AuthUtil.getTenantId()); diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java index 6592961..baaf90a 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java @@ -252,7 +252,7 @@ codeBasicSecDO.setValueCutTypeText(EnumCache.getValue(EnumEnum.CODE_CUT_TYPE,codeBasicSecDTO.getValueCutType())); codeBasicSecDO.setCodeGetValueTypeText(EnumCache.getValue(EnumEnum.CODE_GET_VALUE_TYPE,codeBasicSecDTO.getCodeGetValueType())); //濉厖涓�浜涢粯璁ゅ�� - DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeBasicSecDO, MdmBtmTypeConstant.CODE_BASIC_SEC); + DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeBasicSecDO, MdmBtmTypeConstant.CODE_BASIC_SEC,null); //鎺掑簭鍙凤紝榛樿绛変簬褰撳墠宸叉湁鐨勬暟閲忓姞1 Long total = codeBasicSecMapper.selectCount(Wrappers.<CodeBasicSec>query() .lambda() @@ -369,7 +369,7 @@ } //灏咲TO杞崲涓篋O CodeBasicSec codeBasicSecDO = selectByOid(codeBasicSecDTO.getOid()); - DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeBasicSecDO); + DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeBasicSecDO,null); boolean status = codeRuleService.checkEditDelStatus(codeRuleService.getObjectByOid(codeBasicSecDO.getPkCodeRule()).getLcStatus()); boolean resBoolean; CodeReferConfigVO codeReferConfigVO = null; @@ -627,7 +627,7 @@ continue; } // 鏇存敼鍒涘缓鏃堕棿锛屼慨鏀规椂闂寸瓑榛樿鍊� - DefaultAttrAssimtUtil.addDefaultAttrAssimt(newSecDO,MdmBtmTypeConstant.CODE_BASIC_SEC); + DefaultAttrAssimtUtil.addDefaultAttrAssimt(newSecDO,MdmBtmTypeConstant.CODE_BASIC_SEC,null); //鍥哄畾鐮佹 if(newSecDO.getSecType().equals(CodeSecTypeEnum.CODE_FIXED_SEC.getValue())){ // 鍥哄畾鐮佹瀛樺偍濂給id鍜岀爜鍊肩殑鍏宠仈鍏崇郴 @@ -652,7 +652,7 @@ value.stream().forEach(item -> { item.setOid(""); item.setCodeFixedSecOid(key); - DefaultAttrAssimtUtil.updateDefaultAttrAssimt(item); + DefaultAttrAssimtUtil.updateDefaultAttrAssimt(item,null); codeFixedDOValues.add(item); }); }); @@ -697,7 +697,7 @@ } codeClassValues.forEach((key, value) -> { value.stream().forEach(item -> { - DefaultAttrAssimtUtil.updateDefaultAttrAssimt(item); + DefaultAttrAssimtUtil.updateDefaultAttrAssimt(item,null); item.setCodeClassifySecOid(key); codeClassifyDOValues.add(item); }); @@ -1118,7 +1118,7 @@ }else{ //濡傛灉鏈�澶ф祦姘村彿涓嶄负绌猴紝璇存槑鏃犳渶濂芥祦姘村彿锛屾柊澧炴渶澶ф祦姘村彿 CodeSerialValue codeSerialValue = new CodeSerialValue(); - DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeSerialValue, MdmBtmTypeConstant.CODE_SERIAL_VALUE); + DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeSerialValue, MdmBtmTypeConstant.CODE_SERIAL_VALUE,null); codeSerialValue.setCodeRuleOid(codeRuleOid); codeSerialValue.setSerialUnit(serialUnitString); codeSerialValue.setCodeSecOid(codeBasicSec.getOid()); diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeButtonServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeButtonServiceImpl.java index 8fba98f..61eb4aa 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeButtonServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeButtonServiceImpl.java @@ -118,7 +118,7 @@ //灏咲TO杞崲涓篋O CodeButton codeButtonDO = new CodeButton(); BeanUtilForVCI.copyPropertiesIgnoreCase(codeButtonDTO,codeButtonDO); - DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeButtonDO, MdmBtmTypeConstant.CODE_BUTTON); + DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeButtonDO, MdmBtmTypeConstant.CODE_BUTTON,null); boolean resInsertCodeButton = codeButtonMapper.insert(codeButtonDO) > 0; return resInsertCodeButton ? codeButtonDO2VO(codeButtonDO):null; } @@ -135,7 +135,7 @@ //灏咲TO杞崲涓篋O CodeButton codeButtonDO = selectByOid(codeButtonDTO.getOid()); revisionModelUtil.copyFromDTOIgnore(codeButtonDTO,codeButtonDO); - DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeButtonDO); + DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeButtonDO,null); boolean resUpdateCodeButton = codeButtonMapper.updateById(codeButtonDO) > 0; return resUpdateCodeButton ? codeButtonDO2VO(codeButtonDO):null; } diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java index ef65371..f23efaf 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java @@ -144,7 +144,7 @@ //灏咲TO杞崲涓篋O CodeClassifyProcessTemp codeClassifyProcessTempDO = new CodeClassifyProcessTemp(); BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyProcessTempDTO,codeClassifyProcessTempDO); - DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeClassifyProcessTempDO, MdmBtmTypeConstant.CODE_CLASSIFY_PROCESS_TEMPLATE); + DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeClassifyProcessTempDO, MdmBtmTypeConstant.CODE_CLASSIFY_PROCESS_TEMPLATE,null); codeClassifyProcessTempMapper.insert(codeClassifyProcessTempDO); //鍥犱负涓氬姟绫诲瀷鏈韩娌℃湁鎺у埗鐗堟湰锛屾墍鏈夊己鍒剁粰鐗堟湰revisionValue璁剧疆鍊硷紝骞冲彴涔熶細鍙樻垚绌恒�傘�傘�傘�� //鐗堟湰鍙蜂笉鑳戒娇鐢ㄩ粯璁ょ殑灞炴�� @@ -164,7 +164,7 @@ //灏咲TO杞崲涓篋O CodeClassifyProcessTemp codeClassifyProcessTempDO = selectByOid(codeClassifyProcessTempDTO.getOid()); revisionModelUtil.copyFromDTOIgnore(codeClassifyProcessTempDTO,codeClassifyProcessTempDO); - DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeClassifyProcessTempDO); + DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeClassifyProcessTempDO,null); codeClassifyProcessTempMapper.updateById(codeClassifyProcessTempDO); return CodeClassifyProcessTempWrapper.build().entityVO(codeClassifyProcessTempDO); } diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java index 32c2f3b..095a9db 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java @@ -179,7 +179,7 @@ codeClassifyEntity.setBtmTypeId(codeClassify.getBtmTypeId()); codeClassifyEntity.setBtmTypeName(codeClassify.getBtmTypeName()); } - DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeClassifyEntity, MdmBtmTypeConstant.CODE_CLASSIFY); + DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeClassifyEntity, MdmBtmTypeConstant.CODE_CLASSIFY,null); codeClassifyEntity.setLcStatus(FRAMEWORK_DATA_ENABLED); int insertNumber = codeClassifyMapper.insert(codeClassifyEntity); return R.status(SqlHelper.retBool(insertNumber)); @@ -716,7 +716,7 @@ CodeSerialValue codeSerialValue = codeSerialValueMapper.selectOne(wrapper); if(codeSerialValue == null){ CodeSerialValue newSerialValue = new CodeSerialValue(); - DefaultAttrAssimtUtil.addDefaultAttrAssimt(newSerialValue,"codeserialvalue"); + DefaultAttrAssimtUtil.addDefaultAttrAssimt(newSerialValue,"codeserialvalue",null); newSerialValue.setCodeRuleOid(codeAllCodeVO.getCodeRuleOid()); newSerialValue.setCodeSecOid(codeBasicSec.getOid()); newSerialValue.setSerialUnit(codeAllCodeVO.getSerialUnit()); diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java index f9bfc98..85c153e 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java @@ -328,7 +328,7 @@ //灏咲TO杞崲涓篋O CodeClassifyTemplateAttr codeClassifyTemplateAttrDO = new CodeClassifyTemplateAttr(); BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyTemplateAttrDTO,codeClassifyTemplateAttrDO); - DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeClassifyTemplateAttrDO,"codeclstempattr"); + DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeClassifyTemplateAttrDO,"codeclstempattr",null); baseMapper.insert(codeClassifyTemplateAttrDO); return codeClassifyTemplateAttrDO2VO(codeClassifyTemplateAttrDO); } diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateButtonServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateButtonServiceImpl.java index c4eb529..4d20b33 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateButtonServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateButtonServiceImpl.java @@ -190,7 +190,7 @@ //灏咲TO杞崲涓篋O CodeClassifyTemplateButton codeClassifyTemplateButtonDO = new CodeClassifyTemplateButton(); BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyTemplateButtonDTO,codeClassifyTemplateButtonDO); - DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeClassifyTemplateButtonDO, MdmBtmTypeConstant.CODE_TEMPLATE_BUTTON); + DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeClassifyTemplateButtonDO, MdmBtmTypeConstant.CODE_TEMPLATE_BUTTON,null); if(codeClassifyTemplateButtonDO.getOrderNum()== null){ //鏌ヨ鍏ㄩ儴 Long count = codeClassifyTemplateButtonMapper.selectCount(Wrappers.<CodeClassifyTemplateButton>query() @@ -218,7 +218,7 @@ //灏咲TO杞崲涓篋O CodeClassifyTemplateButton codeClassifyTemplateButtonDO = selectByOid(codeClassifyTemplateButtonDTO.getOid()); revisionModelUtil.copyFromDTOIgnore(codeClassifyTemplateButtonDTO,codeClassifyTemplateButtonDO); - DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeClassifyTemplateButtonDO); + DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeClassifyTemplateButtonDO,null); boolean resUpdateClsTempButton = codeClassifyTemplateButtonMapper.updateById(codeClassifyTemplateButtonDO) > 0; return resUpdateClsTempButton ? codeClassifyTemplateButtonDO2VO(codeClassifyTemplateButtonDO):null; } diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyValueServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyValueServiceImpl.java index be7cad1..55a0b72 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyValueServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyValueServiceImpl.java @@ -130,7 +130,7 @@ CodeClassifyValue codeClassifyValueDO = new CodeClassifyValue(); BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyValueDTO,codeClassifyValueDO); //濉厖涓�浜涢粯璁ゅ�� - DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeClassifyValueDO, MdmBtmTypeConstant.CODE_CLASSIFY_VALUE); + DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeClassifyValueDO, MdmBtmTypeConstant.CODE_CLASSIFY_VALUE,null); LambdaQueryWrapper<CodeClassifyValue> wrapper = Wrappers.<CodeClassifyValue>query() .lambda().eq(CodeClassifyValue::getCodeClassifySecOid, codeClassifyValueDO.getCodeClassifySecOid()); if(Func.isEmpty(codeClassifyValueDO.getParentClassifyValueOid())){ @@ -159,7 +159,7 @@ CodeClassifyValue codeClassifyValueDO = selectByOid(codeClassifyValueDTO.getOid()); revisionModelUtil.copyFromDTOIgnore(codeClassifyValueDTO,codeClassifyValueDO); //濉厖涓�浜涢粯璁ゅ�� - DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeClassifyValueDO); + DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeClassifyValueDO,null); boolean resBoolean = codeClassifyValueMapper.updateById(codeClassifyValueDO) > 0; return resBoolean; } diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeFixedValueServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeFixedValueServiceImpl.java index c26a219..fb5075c 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeFixedValueServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeFixedValueServiceImpl.java @@ -117,7 +117,7 @@ CodeFixedValue codeFixedValueDO = new CodeFixedValue(); BeanUtilForVCI.copyPropertiesIgnoreCase(codeFixedValueDTO,codeFixedValueDO); //濉厖涓�浜涢粯璁ゅ�� - DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeFixedValueDO, MdmBtmTypeConstant.CODE_FIXED_VALUE); + DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeFixedValueDO, MdmBtmTypeConstant.CODE_FIXED_VALUE,null); Long count = this.codeFixedValueMapper.selectCount(Wrappers.<CodeFixedValue>query() .lambda().eq(CodeFixedValue::getCodeFixedSecOid, codeFixedValueDO.getCodeFixedSecOid()) )+1L; @@ -140,7 +140,7 @@ CodeFixedValue codeFixedValueDO = selectByOid(codeFixedValueDTO.getOid()); revisionModelUtil.copyFromDTOIgnore(codeFixedValueDTO,codeFixedValueDO); //濉厖涓�浜涢粯璁ゅ�� - DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeFixedValueDO); + DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeFixedValueDO,null); boolean resBoolean = codeFixedValueMapper.updateById(codeFixedValueDO) > 0; return resBoolean; } diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferConfigServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferConfigServiceImpl.java index 2e90fe6..5a8db8e 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferConfigServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferConfigServiceImpl.java @@ -123,7 +123,7 @@ // } CodeReferConfig codeReferConfig = CodeReferConfigWraper.build().entityDO(codeReferConfigVO); codeReferConfig.setOid(VciBaseUtil.getPk().toUpperCase()); - DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeReferConfig, MdmBtmTypeConstant.CODE_REFER_CONFIG); + DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeReferConfig, MdmBtmTypeConstant.CODE_REFER_CONFIG,null); codeReferConfig.setTenantId(AuthUtil.getTenantId()); boolean resInsertReferConfig = this.codeReferconfigMapper.insert(codeReferConfig) > 0; if (!resInsertReferConfig) { -- Gitblit v1.9.3