From f099be6e30adfdea4580b09e33d75dc146a7a475 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 06 十二月 2023 09:05:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/DockingPreAttrMappingServiceImpl.java | 4
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmProductCodeService.java | 3
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyValueServiceImpl.java | 4
Source/UBCS/ubcs-ops/ubcs-resource/src/main/java/com/vci/ubcs/resource/service/impl/FileServiceImpl.java | 2
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/CodeButtonServiceImpl.java | 4
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java | 6
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/MdmProductCodeServiceImpl.java | 20 +-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java | 6
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java | 33 ++--
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java | 174 ++++++++++++++++++++++--
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/CodeResembleRuleServiceImpl.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-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java | 16 +-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.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/DockingSystemServiceImpl.java | 4
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 10
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java | 34 ++--
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/CodeRuleCharacterServiceImpl.java | 2
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/CodeRuleServiceImpl.java | 10
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeTempphaseServiceImpl.java | 4
26 files changed, 259 insertions(+), 113 deletions(-)
diff --git a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/java/com/vci/ubcs/resource/service/impl/FileServiceImpl.java b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/java/com/vci/ubcs/resource/service/impl/FileServiceImpl.java
index 9b9d106..5cba891 100644
--- a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/java/com/vci/ubcs/resource/service/impl/FileServiceImpl.java
+++ b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/java/com/vci/ubcs/resource/service/impl/FileServiceImpl.java
@@ -279,7 +279,7 @@
fileObject.setObjectName(bladeFile.getName());
fileObject.setFileLink(bladeFile.getLink());
// 娣诲姞涔嬪墠璧嬮粯璁ゅ��
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(fileObject, MdmBtmTypeConstant.FILE_OBJECT,null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(fileObject, MdmBtmTypeConstant.FILE_OBJECT);
fileObjectMapper.insert(fileObject);
if(log.isDebugEnabled()){
log.debug("鏂板鏂囦欢",fileObject.toString());
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
index 7c77831..74939d7 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
@@ -1,24 +1,16 @@
package com.vci.ubcs.starter.util;
-import com.alibaba.nacos.api.naming.pojo.healthcheck.impl.Http;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.model.BaseModel;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
-import org.apache.poi.ss.formula.functions.T;
+import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.WebUtil;
-import org.springframework.web.util.WebUtils;
-
-import javax.servlet.http.HttpServletRequest;
-import java.lang.reflect.Field;
-import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
-import java.util.Locale;
import java.util.Map;
/**
@@ -37,7 +29,7 @@
* @return
* @throws VciBaseException
*/
- public static <T extends BaseModel> T addDefaultAttrAssimt(T object, String btmName, HttpServletRequest request/*涓嶅湪澶氱嚎绋嬫祦涓娇鐢ㄥ氨涓嶉渶瑕佷紶request*/) throws VciBaseException {
+ public static <T extends BaseModel> T addDefaultAttrAssimt(T object, String btmName) throws VciBaseException {
BaseModel baseModel = object;
try {
baseModel.setOid(VciBaseUtil.getPk());
@@ -46,8 +38,53 @@
baseModel.setLastModifyTime(new Date());
baseModel.setTs(new Date());
baseModel.setRevisionOid(VciBaseUtil.getPk());
- String account = Func.isEmpty(request) ? AuthUtil.getUser().getAccount() : AuthUtil.getUser(request).getAccount();
baseModel.setBtmname(btmName);
+ baseModel.setCreator(AuthUtil.getUser().getAccount());
+ baseModel.setFirstR("1");
+ baseModel.setFirstV("1");
+ baseModel.setLastR("1");
+ baseModel.setLastV("1");
+ baseModel.setRevisionSeq(1);
+ // TODO:鐩墠鍙湁缂栫爜瑙勫垯涓湁鐢ㄥ埌锛屽悗鏈熼渶瑕佸幓鎺夎繖娈典唬鐮佺殑璇濓紝灏辨妸浠栧姞鍦ㄧ紪鐮佽鍒欐柊澧炰腑鍘�
+ if(Func.isBlank(baseModel.getOwner())){
+ // 璁剧疆鎵�鏈夎��
+ baseModel.setOwner(AuthUtil.getUserId().toString());
+ }
+
+ baseModel.setVersionSeq(1);
+ baseModel.setVersionRule("0");
+ baseModel.setVersionValue("1");
+ baseModel.setRevisionOid(VciBaseUtil.getPk());
+ baseModel.setLastModifier(AuthUtil.getUser().getAccount());
+ baseModel.setRevisionValue("1");
+ baseModel.setRevisionRule("1");
+ baseModel.setTenantId(AuthUtil.getTenantId());
+ }catch (VciBaseException e){
+ e.printStackTrace();
+ }
+ return (T)baseModel;
+ }
+
+ /**
+ * 褰撳湪澶氱嚎绋嬫祦涓皟鐢ㄦ椂锛岃幏鍙栦笉鍒拌姹傚ご淇℃伅锛�
+ * 鎵�浠ュ緱鍦ㄥ绾跨▼娴佸闈㈣幏鍙栧埌request
+ * @param object 缁ф壙浜咮aseModel鐨勫疄浣撳璞�
+ * @param <T> 杩斿洖鍊肩殑绫诲瀷
+ * @param btmName 涓氬姟绫诲瀷
+ * @return
+ * @throws VciBaseException
+ */
+ public static <T extends BaseModel> T addDefaultAttrAssimt(T object, String btmName, BladeUser user) throws VciBaseException {
+ BaseModel baseModel = object;
+ try {
+ baseModel.setOid(VciBaseUtil.getPk());
+ baseModel.setCreateTime(new Date());
+ baseModel.setNameOid(VciBaseUtil.getPk());
+ baseModel.setLastModifyTime(new Date());
+ baseModel.setTs(new Date());
+ baseModel.setRevisionOid(VciBaseUtil.getPk());
+ baseModel.setBtmname(btmName);
+ String account = Func.isNotEmpty(user) ? user.getAccount():AuthUtil.getUser().getAccount();
baseModel.setCreator(account);
baseModel.setFirstR("1");
baseModel.setFirstV("1");
@@ -57,7 +94,7 @@
// TODO:鐩墠鍙湁缂栫爜瑙勫垯涓湁鐢ㄥ埌锛屽悗鏈熼渶瑕佸幓鎺夎繖娈典唬鐮佺殑璇濓紝灏辨妸浠栧姞鍦ㄧ紪鐮佽鍒欐柊澧炰腑鍘�
if(Func.isBlank(baseModel.getOwner())){
// 璁剧疆鎵�鏈夎��
- baseModel.setOwner(Func.isEmpty(request) ? AuthUtil.getUserId().toString():AuthUtil.getUserId(request).toString());
+ baseModel.setOwner(Func.isNotEmpty(user) ? user.getUserId().toString():AuthUtil.getUserId().toString());
}
baseModel.setVersionSeq(1);
@@ -67,7 +104,7 @@
baseModel.setLastModifier(account);
baseModel.setRevisionValue("1");
baseModel.setRevisionRule("1");
- baseModel.setTenantId(Func.isEmpty(request) ? AuthUtil.getTenantId():AuthUtil.getTenantId(request));
+ baseModel.setTenantId(Func.isNotEmpty(user) ? user.getTenantId():AuthUtil.getTenantId());
}catch (VciBaseException e){
e.printStackTrace();
}
@@ -81,7 +118,7 @@
* @return
* @throws VciBaseException
*/
- public static <T extends BaseModel> T updateDefaultAttrAssimt(T object,HttpServletRequest request) throws VciBaseException {
+ public static <T extends BaseModel> T updateDefaultAttrAssimt(T object) throws VciBaseException {
BaseModel baseModel = object;
try {
baseModel.setLastModifyTime(new Date());
@@ -89,8 +126,29 @@
// 鐢ㄦ埛id
// String userId = AuthUtil.getUserId().toString();
// 瑕佹眰鏀规垚璐﹀彿
- String account = Func.isEmpty(request) ? AuthUtil.getUser().getAccount() : AuthUtil.getUser(request).getAccount();
- baseModel.setLastModifier(account);
+ baseModel.setLastModifier(AuthUtil.getUser().getAccount());
+ }catch (VciBaseException e){
+ e.printStackTrace();
+ }
+ return (T)baseModel;
+ }
+
+ /**
+ * 淇敼鏃跺～鍏呴粯璁ゅ�硷細澶氱嚎绋嬫祦涓皟鐢�
+ * @param object 缁ф壙浜咮aseModel鐨勫疄浣撳璞�
+ * @param <T> 杩斿洖鍊肩殑绫诲瀷
+ * @return
+ * @throws VciBaseException
+ */
+ public static <T extends BaseModel> T updateDefaultAttrAssimt(T object, BladeUser user) throws VciBaseException {
+ BaseModel baseModel = object;
+ try {
+ baseModel.setLastModifyTime(new Date());
+ baseModel.setTs(new Date());
+ // 鐢ㄦ埛id
+ // String userId = AuthUtil.getUserId().toString();
+ // 瑕佹眰鏀规垚璐﹀彿
+ baseModel.setLastModifier(Func.isNotEmpty(user) ? user.getAccount():AuthUtil.getUser().getAccount());
}catch (VciBaseException e){
e.printStackTrace();
}
@@ -104,7 +162,7 @@
* @return
* @throws VciBaseException
*/
- public static <T extends BaseModel> T copplyDefaultAttrAssimt(Map<String,String> dataMap, T object,HttpServletRequest request) throws VciBaseException {
+ public static <T extends BaseModel> T copplyDefaultAttrAssimt(Map<String,String> dataMap, T object) throws VciBaseException {
BaseModel baseModel = object;
try {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -158,7 +216,7 @@
baseModel.setVersionRule(dataMap.getOrDefault("VERSIONRULE",""));
baseModel.setVersionValue(dataMap.getOrDefault("VERSIONVALUE",""));
baseModel.setRevisionOid(dataMap.getOrDefault("REVISIONOID",""));
- baseModel.setLastModifier(Func.isEmpty(request) ? AuthUtil.getUser().getAccount() : AuthUtil.getUser(request).getAccount());
+ baseModel.setLastModifier(AuthUtil.getUser().getAccount());
baseModel.setLcStatus(dataMap.getOrDefault("LCSTATUS",""));
baseModel.setName(dataMap.getOrDefault("NAME",""));
baseModel.setTenantId(dataMap.getOrDefault("TENADTID",""));
@@ -170,6 +228,85 @@
}
}catch (VciBaseException e){
e.printStackTrace();
+ throw e;
+ }
+ return (T)baseModel;
+ }
+
+ /**
+ * 鏂板鏃跺～鍏呴粯璁ゅ�硷細澶氱嚎绋嬫祦涓皟鐢�
+ * @param object 缁ф壙浜咮aseModel鐨勫疄浣撳璞�
+ * @param <T> 杩斿洖鍊肩殑绫诲瀷
+ * @return
+ * @throws VciBaseException
+ */
+ public static <T extends BaseModel> T copplyDefaultAttrAssimt(Map<String,String> dataMap, T object, BladeUser user) throws VciBaseException {
+ BaseModel baseModel = object;
+ try {
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ baseModel.setOid(dataMap.getOrDefault("OID",""));
+ baseModel.setId(dataMap.getOrDefault("ID",""));
+ Map<String,Object> newDataMap=new HashMap<>();
+ /*for (String key:dataMap.keySet()){
+ Object value=dataMap.get(key);
+ newDataMap.put(key.toLowerCase(Locale.ROOT),value);
+ }*/
+ /* dataMap.forEach((key,value)->{
+ newDataMap.put(key.toLowerCase(Locale.ROOT),value);
+ });*/
+ //baseModel.setData((Map)newDataMap);
+ Object createTimeObj=dataMap.getOrDefault("CREATETIME","");
+ if(createTimeObj!=null) {
+ String createTime = createTimeObj.toString();
+ baseModel.setCreateTime(chageStringToDate(createTime));
+ }
+ baseModel.setNameOid(dataMap.getOrDefault("NAMEOID",""));
+
+ Object lastModifyTimeObj=dataMap.getOrDefault("LASTMODIFYTIME","");
+ if(lastModifyTimeObj!=null) {
+ String lastModifyTime = lastModifyTimeObj.toString();
+ baseModel.setLastModifyTime(chageStringToDate(lastModifyTime));
+ }
+ Object tsObj=dataMap.getOrDefault("TS","");
+ if(tsObj!=null) {
+ String ts = tsObj.toString();
+ baseModel.setTs(chageStringToDate(ts));
+ }
+ baseModel.setRevisionOid(dataMap.getOrDefault("REVISIONOID",""));
+ //鐢ㄦ埛id ; 瑕佹眰鏀规垚浜嗚处鍙�
+ // String userId = AuthUtil.getUserId().toString();
+ baseModel.setBtmname(dataMap.getOrDefault("BTMNAME",""));
+ baseModel.setCreator(dataMap.getOrDefault("CREATOR",""));
+ baseModel.setFirstR(dataMap.getOrDefault("FIRSTR",""));
+ baseModel.setFirstV(dataMap.getOrDefault("FIRSTV",""));
+ baseModel.setLastR(dataMap.getOrDefault("LASTR",""));
+ baseModel.setLastV(dataMap.getOrDefault("LASTV",""));
+ Object revisionseq =dataMap.getOrDefault("REVISIONSEQ","");
+ if(revisionseq!=null){
+ baseModel.setRevisionSeq(chageStringToInt(revisionseq.toString()));
+ }
+
+ baseModel.setOwner(dataMap.getOrDefault("OWNER",""));
+ Object versionseq =dataMap.getOrDefault("VERSIONSEQ","");
+ if(versionseq!=null){
+ baseModel.setVersionSeq(chageStringToInt(versionseq.toString()));
+ }
+ baseModel.setVersionRule(dataMap.getOrDefault("VERSIONRULE",""));
+ baseModel.setVersionValue(dataMap.getOrDefault("VERSIONVALUE",""));
+ baseModel.setRevisionOid(dataMap.getOrDefault("REVISIONOID",""));
+ baseModel.setLastModifier(Func.isNotEmpty(user) ? user.getAccount():AuthUtil.getUser().getAccount());
+ baseModel.setLcStatus(dataMap.getOrDefault("LCSTATUS",""));
+ baseModel.setName(dataMap.getOrDefault("NAME",""));
+ baseModel.setTenantId(dataMap.getOrDefault("TENADTID",""));
+ baseModel.setDescription(dataMap.getOrDefault("DESCRIOTION",""));
+ baseModel.setCopyFromVersion(dataMap.getOrDefault("COPYFROMVERSION",""));
+ Object secretgrade=dataMap.get("SECRETGRADE");
+ if(secretgrade!=null){
+ baseModel.setSecretGrade(chageStringToInt(secretgrade.toString()));
+ }
+ }catch (VciBaseException e){
+ e.printStackTrace();
+ throw e;
}
return (T)baseModel;
}
@@ -194,4 +331,5 @@
}
return date;
}
+
}
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java
index 310f5bc..42e4177 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java
@@ -258,9 +258,9 @@
if (dockingPreClassify == null|| StringUtils.isBlank(dockingPreClassify.getOid())) {
dockingPreClassify = new DockingPreClassify();
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreClassify, MdmBtmTypeConstant.DOCKING_PRE_JCLASSIFY,null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreClassify, MdmBtmTypeConstant.DOCKING_PRE_JCLASSIFY);
} else {
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreClassify,null);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreClassify);
}
dockingPreClassify.setOid(id);
dockingPreClassify.setName(className);
@@ -314,10 +314,10 @@
jviewModelObject = jviewmodelMap.get(viewName);
//褰卞搷缂栫爜椤圭殑鏁版嵁
jviewModelObject.setImpactList(impactList);
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(jviewModelObject,null);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(jviewModelObject);
} else {
jviewModelObject =new DockingPreViewModel();
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(jviewModelObject,MdmBtmTypeConstant.DOCKING_PRE_JVIEWMODEL,null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(jviewModelObject,MdmBtmTypeConstant.DOCKING_PRE_JVIEWMODEL);
jviewModelObject.setSourceClassifyId(jclassId);// 闆嗗洟鍒嗙被id
jviewModelObject.setViewName(viewName);// 闆嗗洟瑙嗗浘鍚嶇О
//褰卞搷缂栫爜椤圭殑鏁版嵁
@@ -372,9 +372,9 @@
dockingPreMetaAttr = jmetaattrMap.get(englishName);
dockingPreMetaAttr.setChineseName(chineseName);
dockingPreMetaAttr.setDefaultValue(defaultValue);
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreMetaAttr,null);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreMetaAttr);
} else {
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreMetaAttr,MdmBtmTypeConstant.DOCKING_PRE_JMETAATRR,null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreMetaAttr,MdmBtmTypeConstant.DOCKING_PRE_JMETAATRR);
dockingPreMetaAttr.setSourceClassifyId(jclassId);// 闆嗗洟鍒嗙被id
dockingPreMetaAttr.setViewModelId(jviewModelObject.getOid());// 闆嗗洟瑙嗗浘妯″瀷id
dockingPreMetaAttr.setChineseName(chineseName);// 灞炴�у悕绉�
@@ -436,9 +436,9 @@
rangeObject = rangeMap.get(rangeKey);
rangeObject.setNumTextValue(keyValue);
rangeObject.setNumText(rangeKey);
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(rangeObject,null);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(rangeObject);
} else {
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(rangeObject,MdmBtmTypeConstant.DOCKING_PRE_JRANGE,null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(rangeObject,MdmBtmTypeConstant.DOCKING_PRE_JRANGE);
rangeObject.setNumTextValue(keyValue);
rangeObject.setNumText(rangeKey);
rangeObject.setTs(rangeObject.getLastModifyTime());
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/DockingPreAttrMappingServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/DockingPreAttrMappingServiceImpl.java
index 4fd3f46..0711970 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/DockingPreAttrMappingServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/DockingPreAttrMappingServiceImpl.java
@@ -104,9 +104,9 @@
DockingPreAttrMapping dockingPreAttrMapping=new DockingPreAttrMapping();
if(dockingPreAttrMappingMap.containsKey(attrOid)){
dockingPreAttrMapping= dockingPreAttrMappingMap.get(attrOid);
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreAttrMapping,null);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreAttrMapping);
}else{
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreAttrMapping, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM,null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreAttrMapping, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
dockingPreAttrMapping.setMetaListId(dockingPreMetaAttr.getOid());//灞炴�т富閿�
dockingPreAttrMapping.setSourceAttrKey(dockingPreMetaAttr.getEnglishName());//鑻辨枃鍚嶇О
dockingPreAttrMapping.setSourceAttrName(dockingPreMetaAttr.getChineseName());//涓枃鍚嶇О
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java
index 48825a9..3db3194 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java
@@ -175,8 +175,8 @@
baseModel.setId(10+customCoding);
}
BeanUtilForVCI.copyDeclaredIgnoreCase(baseModel, baseModel);
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel,null);
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel,null);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
baseModel.getData().getOrDefault("groupCode", customCoding);
updateCbos.add(baseModel);//鏇存柊鏁版嵁闆嗗洟code
@@ -189,14 +189,14 @@
dockingPreApplyForm.setMsg("鐢宠锛�" + msg);
dockingPreApplyForm.setContent("");
dockingPreApplyForm.setGroupCode("");
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm,null);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm);
});
addDockingPreApplyFormMap.forEach((key, dockingPreApplyForm) -> {
dockingPreApplyForm.setCode("2");
dockingPreApplyForm.setMsg("鐢宠锛�" + msg);
dockingPreApplyForm.setContent("");
dockingPreApplyForm.setGroupCode("");
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM,null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
});
}
if (editDockingPreApplyFormMap.size() > 0) {
@@ -300,7 +300,7 @@
if(partCoe.equals(classOid)){
baseModel.setId(10+customCoding);
}
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel,null);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
// baseModel.setId(customCoding);
baseModel.getData().put("groupCode", customCoding);
updateCbos.add(baseModel);//鏇存柊鏁版嵁闆嗗洟code
@@ -313,14 +313,14 @@
dockingPreApplyForm.setMsg("淇敼锛�" + msg);
dockingPreApplyForm.setContent("");
dockingPreApplyForm.setGroupCode("");
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm,null);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm);
});
addDockingPreApplyFormMap.forEach((key, dockingPreApplyForm) -> {
dockingPreApplyForm.setCode("2");
dockingPreApplyForm.setMsg("淇敼锛�" + msg);
dockingPreApplyForm.setContent("");
dockingPreApplyForm.setGroupCode("");
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM,null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
});
}
if (editDockingPreApplyFormMap.size() > 0) {
@@ -439,9 +439,9 @@
log.info("classify:-------------->閾炬帴鍚嶇О:"+nodeLinkName);
log.info("classify:-------------->閾炬帴鐗堟湰:"+version);
if (dockingPreClassify == null || StringUtils.isBlank(dockingPreClassify.getOid())) {
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreClassify,MdmBtmTypeConstant.DOCKING_PRE_JCLASSIFY,null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreClassify,MdmBtmTypeConstant.DOCKING_PRE_JCLASSIFY);
} else {
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreClassify,null);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreClassify);
}
dockingPreClassify.setOid(id);
dockingPreClassify.setName(className);
@@ -603,9 +603,9 @@
log.info("classify:-------------->閾炬帴鍚嶇О:"+nodeLinkName);
if (dockingPreClassify == null || StringUtils.isBlank(dockingPreClassify.getOid())) {
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreClassify,MdmBtmTypeConstant.DOCKING_PRE_JCLASSIFY,null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreClassify,MdmBtmTypeConstant.DOCKING_PRE_JCLASSIFY);
} else {
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreClassify,null);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreClassify);
}
dockingPreClassify.setOid(id);
dockingPreClassify.setName(className);
@@ -660,10 +660,10 @@
jviewModelObject = jviewmodelMap.get(viewName);
//褰卞搷缂栫爜椤圭殑鏁版嵁
jviewModelObject.setImpactList(impactList);
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(jviewModelObject,null);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(jviewModelObject);
} else {
jviewModelObject =new DockingPreViewModel();
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(jviewModelObject,MdmBtmTypeConstant.DOCKING_PRE_JVIEWMODEL,null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(jviewModelObject,MdmBtmTypeConstant.DOCKING_PRE_JVIEWMODEL);
jviewModelObject.setSourceClassifyId(jclassId);// 闆嗗洟鍒嗙被id
jviewModelObject.setViewName(viewName);// 闆嗗洟瑙嗗浘鍚嶇О
//褰卞搷缂栫爜椤圭殑鏁版嵁
@@ -718,9 +718,9 @@
dockingPreMetaAttr = jmetaattrMap.get(englishName);
dockingPreMetaAttr.setChineseName(chineseName);
dockingPreMetaAttr.setDefaultValue(defaultValue);
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreMetaAttr,null);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreMetaAttr);
} else {
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreMetaAttr,MdmBtmTypeConstant.DOCKING_PRE_JMETAATRR,null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreMetaAttr,MdmBtmTypeConstant.DOCKING_PRE_JMETAATRR);
dockingPreMetaAttr.setSourceClassifyId(jclassId);// 闆嗗洟鍒嗙被id
dockingPreMetaAttr.setViewModelId(jviewModelObject.getOid());// 闆嗗洟瑙嗗浘妯″瀷id
dockingPreMetaAttr.setChineseName(chineseName);// 灞炴�у悕绉�
@@ -782,9 +782,9 @@
rangeObject = rangeMap.get(rangeKey);
rangeObject.setNumTextValue(keyValue);
rangeObject.setNumText(rangeKey);
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(rangeObject,null);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(rangeObject);
} else {
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(rangeObject,MdmBtmTypeConstant.DOCKING_PRE_JRANGE,null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(rangeObject,MdmBtmTypeConstant.DOCKING_PRE_JRANGE);
rangeObject.setNumTextValue(keyValue);
rangeObject.setNumText(rangeKey);
rangeObject.setTs(rangeObject.getLastModifyTime());
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmProductCodeService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmProductCodeService.java
index 42517a8..67b6fde 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmProductCodeService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmProductCodeService.java
@@ -5,6 +5,7 @@
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateVO;
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
import com.vci.ubcs.starter.revision.model.BaseModel;
+import org.springblade.core.secure.BladeUser;
import java.util.Collection;
import java.util.List;
@@ -20,7 +21,7 @@
* @param dataCBOList 涓氬姟鏁版嵁
*/
List<String> productCodeAndSaveData(CodeClassifyFullInfoBO classifyFullInfoBO, CodeClassifyTemplateVO templateVO,
- CodeRuleVO ruleVO, List<CodeOrderSecDTO> secDTOList, List<BaseModel> dataCBOList) throws Exception;
+ CodeRuleVO ruleVO, List<CodeOrderSecDTO> secDTOList, List<BaseModel> dataCBOList, BladeUser user) throws Exception;
/**
* 鍥炴敹鐮佸��
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 5bab4a3..a0be413 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",null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(systemClassifyRole,"systemClassifyRole");
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 baaf90a..6592961 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,null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeBasicSecDO, MdmBtmTypeConstant.CODE_BASIC_SEC);
//鎺掑簭鍙凤紝榛樿绛変簬褰撳墠宸叉湁鐨勬暟閲忓姞1
Long total = codeBasicSecMapper.selectCount(Wrappers.<CodeBasicSec>query()
.lambda()
@@ -369,7 +369,7 @@
}
//灏咲TO杞崲涓篋O
CodeBasicSec codeBasicSecDO = selectByOid(codeBasicSecDTO.getOid());
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeBasicSecDO,null);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeBasicSecDO);
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,null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(newSecDO,MdmBtmTypeConstant.CODE_BASIC_SEC);
//鍥哄畾鐮佹
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,null);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(item);
codeFixedDOValues.add(item);
});
});
@@ -697,7 +697,7 @@
}
codeClassValues.forEach((key, value) -> {
value.stream().forEach(item -> {
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(item,null);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(item);
item.setCodeClassifySecOid(key);
codeClassifyDOValues.add(item);
});
@@ -1118,7 +1118,7 @@
}else{
//濡傛灉鏈�澶ф祦姘村彿涓嶄负绌猴紝璇存槑鏃犳渶濂芥祦姘村彿锛屾柊澧炴渶澶ф祦姘村彿
CodeSerialValue codeSerialValue = new CodeSerialValue();
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeSerialValue, MdmBtmTypeConstant.CODE_SERIAL_VALUE,null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeSerialValue, MdmBtmTypeConstant.CODE_SERIAL_VALUE);
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 61eb4aa..8fba98f 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,null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeButtonDO, MdmBtmTypeConstant.CODE_BUTTON);
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,null);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeButtonDO);
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 f23efaf..ef65371 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,null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeClassifyProcessTempDO, MdmBtmTypeConstant.CODE_CLASSIFY_PROCESS_TEMPLATE);
codeClassifyProcessTempMapper.insert(codeClassifyProcessTempDO);
//鍥犱负涓氬姟绫诲瀷鏈韩娌℃湁鎺у埗鐗堟湰锛屾墍鏈夊己鍒剁粰鐗堟湰revisionValue璁剧疆鍊硷紝骞冲彴涔熶細鍙樻垚绌恒�傘�傘�傘��
//鐗堟湰鍙蜂笉鑳戒娇鐢ㄩ粯璁ょ殑灞炴��
@@ -164,7 +164,7 @@
//灏咲TO杞崲涓篋O
CodeClassifyProcessTemp codeClassifyProcessTempDO = selectByOid(codeClassifyProcessTempDTO.getOid());
revisionModelUtil.copyFromDTOIgnore(codeClassifyProcessTempDTO,codeClassifyProcessTempDO);
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeClassifyProcessTempDO,null);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeClassifyProcessTempDO);
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 095a9db..32c2f3b 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,null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeClassifyEntity, MdmBtmTypeConstant.CODE_CLASSIFY);
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",null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(newSerialValue,"codeserialvalue");
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 85c153e..f9bfc98 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",null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeClassifyTemplateAttrDO,"codeclstempattr");
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 4d20b33..c4eb529 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,null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeClassifyTemplateButtonDO, MdmBtmTypeConstant.CODE_TEMPLATE_BUTTON);
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,null);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeClassifyTemplateButtonDO);
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 55a0b72..be7cad1 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,null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeClassifyValueDO, MdmBtmTypeConstant.CODE_CLASSIFY_VALUE);
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,null);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeClassifyValueDO);
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 fb5075c..c26a219 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,null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeFixedValueDO, MdmBtmTypeConstant.CODE_FIXED_VALUE);
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,null);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeFixedValueDO);
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 5a8db8e..2e90fe6 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,null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeReferConfig, MdmBtmTypeConstant.CODE_REFER_CONFIG);
codeReferConfig.setTenantId(AuthUtil.getTenantId());
boolean resInsertReferConfig = this.codeReferconfigMapper.insert(codeReferConfig) > 0;
if (!resInsertReferConfig) {
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeResembleRuleServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeResembleRuleServiceImpl.java
index 8aff713..034a62b 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeResembleRuleServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeResembleRuleServiceImpl.java
@@ -173,7 +173,7 @@
//灏咲TO杞崲涓篋O
CodeResembleRule codeResembleRuleDO = new CodeResembleRule();
BeanUtilForVCI.copyPropertiesIgnoreCase(codeResembleRuleDTO,codeResembleRuleDO);
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeResembleRuleDO, MdmBtmTypeConstant.CODE_RESEMBLE_RULE,null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeResembleRuleDO, MdmBtmTypeConstant.CODE_RESEMBLE_RULE);
codeResembleRuleDO.setTenantId(AuthUtil.getTenantId());
codeResembleRuleDO.setLctid("frameworkDataLc");
codeResembleRuleDO.setLcStatus("Enabled");
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleCharacterServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleCharacterServiceImpl.java
index 7bc8308..edff3be 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleCharacterServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleCharacterServiceImpl.java
@@ -112,7 +112,7 @@
codeRuleCharacterMapper.updateById(codeRuleCharacter);
}else{
codeRuleCharacter=new CodeRuleCharacter();
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeRuleCharacter,"character",null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeRuleCharacter,"character");
codeRuleCharacter.setCodeRuleId(codeRuleCharacterVO.getCodeRuleId());
codeRuleCharacter.setChartType(codeRuleCharacterVO.getChartType());
codeRuleCharacter.setChartValue(codeRuleCharacterVO.getChartValue());
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
index 8045c13..6b963c6 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
@@ -163,7 +163,7 @@
// 灏咲TO杞崲涓篋O
CodeRule codeRule = Objects.requireNonNull(BeanUtil.copy(codeRuleDTO, CodeRule.class));
// 濉厖榛樿鍊�
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeRule, MdmBtmTypeConstant.CODE_RULE,null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeRule, MdmBtmTypeConstant.CODE_RULE);
codeRule.setLctid(CODE_RULE_LC);
codeRule.setLcStatus(FRAMEWORK_RELEASE_EDITING);
codeRule.setOwnerText(AuthUtil.getUserAccount()+"("+AuthUtil.getNickName()+")");
@@ -239,7 +239,7 @@
codeRule.setOwnerText(userR.getData().getAccount()+"("+userR.getData().getRealName()+")");
}
}
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeRule,null);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeRule);
return R.status(codeRuleMapper.updateById(codeRule)>0);
}
@@ -518,7 +518,7 @@
}
VciBaseUtil.alertNotNull(codeRuleDTO, "闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄");
CodeRule codeRuleDO = new CodeRule();
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeRuleDO,MdmBtmTypeConstant.CODE_RULE,null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeRuleDO,MdmBtmTypeConstant.CODE_RULE);
BeanUtilForVCI.copyPropertiesIgnoreCase(codeRuleDTO, codeRuleDO);
boolean exFlag = codeRuleMapper.insert(codeRuleDO)>0;
List<CodeBasicSecDTO> secList = codeRuleDTO.getElements();
@@ -542,7 +542,7 @@
continue;
}
// 鏇存敼鍒涘缓鏃堕棿锛屼慨鏀规椂闂寸瓑榛樿鍊�
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeBasicSecDO,MdmBtmTypeConstant.CODE_BASIC_SEC,null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeBasicSecDO,MdmBtmTypeConstant.CODE_BASIC_SEC);
// 鍥哄畾鐮佹
if(codeBasicSecDO.getSecType().equals(CodeSecTypeEnum.CODE_FIXED_SEC.getValue())){
// 鍥哄畾鐮佹瀛樺偍濂給id鍜岀爜鍊肩殑鍏宠仈鍏崇郴
@@ -565,7 +565,7 @@
value.stream().forEach(item -> {
item.setOid("");
item.setCodeFixedSecOid(key);
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(item,null);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(item);
codeFixedDOValues.add(item);
});
});
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeTempphaseServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeTempphaseServiceImpl.java
index 8941dd3..888ea09 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeTempphaseServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeTempphaseServiceImpl.java
@@ -223,7 +223,7 @@
//灏咲TO杞崲涓篋O
CodeTemplatePhase codeTemplatePhaseDO = new CodeTemplatePhase();
BeanUtilForVCI.copyPropertiesIgnoreCase(codeTemplatePhaseDTO, codeTemplatePhaseDO);
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeTemplatePhaseDO, MdmBtmTypeConstant.CODE_TEMPLATE_PHASE,null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeTemplatePhaseDO, MdmBtmTypeConstant.CODE_TEMPLATE_PHASE);
//WebUtil.setPersistence(false);
boolean resInsertTempPhase = codeTemplatePhaseMapper.insert(codeTemplatePhaseDO) > 0;
List<CodePhaseAttr> attrDOList = new ArrayList<>();
@@ -253,7 +253,7 @@
//灏咲TO杞崲涓篋O
CodeTemplatePhase codeTemplatePhaseEntityDO = selectByOid(codeTemplatePhaseDTO.getOid());
revisionModelUtil.copyFromDTOIgnore(codeTemplatePhaseDTO, codeTemplatePhaseEntityDO);
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeTemplatePhaseEntityDO,null);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeTemplatePhaseEntityDO);
//WebUtil.setPersistence(false);
codeTemplatePhaseMapper.updateById(codeTemplatePhaseEntityDO);
//鎶婁互鍓嶇殑鍒犻櫎
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java
index 0d4ee95..e0ac426 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java
@@ -191,7 +191,7 @@
DockingSysIntParam sysIntParamDO = new DockingSysIntParam();
sysIntParamDTO.setInfoOid(dockingSystemConfigDTO.getOid());
BeanUtilForVCI.copyPropertiesIgnoreCase(sysIntParamDTO, sysIntParamDO);
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(sysIntParamDO, MdmBtmTypeConstant.SYS_INT_PARAMTERY,null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(sysIntParamDO, MdmBtmTypeConstant.SYS_INT_PARAMTERY);
sysIntParamList.add(sysIntParamDO);
});
}
@@ -202,13 +202,13 @@
DockingSysIntHeader dockingSysIntHeader = new DockingSysIntHeader();
sysIntHeaderDTO.setInfoOid(dockingSystemConfigDTO.getOid());
BeanUtilForVCI.copyPropertiesIgnoreCase(sysIntHeaderDTO, dockingSysIntHeader);
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingSysIntHeader,MdmBtmTypeConstant.SYS_INT_HEADER,null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingSysIntHeader,MdmBtmTypeConstant.SYS_INT_HEADER);
sysIntHeaderList.add(dockingSysIntHeader);
});
}
dockingSysIntParamService.saveBatch(sysIntParamList);
dockingSysIntHeaderService.saveBatch(sysIntHeaderList);
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingSystemConfig,MdmBtmTypeConstant.SYS_INT_INFO,null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingSystemConfig,MdmBtmTypeConstant.SYS_INT_INFO);
dockingSystemConfigMapper.insert(dockingSystemConfig);
}else{
throw new Throwable("鏍规嵁閫夋嫨鐨勯泦鎴愮郴缁熸湭鏍￠獙鍒扮郴缁熶腑瀛樺湪姝ら泦鎴愮郴缁燂紝璇锋牳瀵癸紒");
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemServiceImpl.java
index 325c9e7..1186d51 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemServiceImpl.java
@@ -72,7 +72,7 @@
VciBaseUtil.alertNotNull(dockingSystemDTO, "闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄");
//灏咲TO杞崲涓篋O
DockingSystem dockingSystem = Objects.requireNonNull(BeanUtil.copy(dockingSystemDTO, DockingSystem.class));
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingSystem, MdmBtmTypeConstant.SYS_INT_BASE,null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingSystem, MdmBtmTypeConstant.SYS_INT_BASE);
dockingSystem.setLctid(CODE_RULE_LC);
dockingSystem.setLcStatus(FRAMEWORK_RELEASE_EDITING);
boolean resInsert = dockingSystemMapper.insert(dockingSystem) > 0;
@@ -108,7 +108,7 @@
userClient.updateUserByAccount(dockingSystem.getId(),dockingSystemDTO.getId().toLowerCase(Locale.ROOT));
}
revisionModelUtil.copyFromDTOIgnore(dockingSystemDTO,dockingSystem);
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingSystem,null);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingSystem);
dockingSystemMapper.updateById(dockingSystem);
return DockingSystemWrapper.build().entityVO(dockingSystem);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
index 1e18849..e187c23 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -68,6 +68,7 @@
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.log.annotation.OperateLog;
import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
@@ -505,6 +506,7 @@
CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(orderDTO.getCodeClassifyOid());
CodeClassifyTemplateVO templateVO = templateService.getObjectHasAttrByOid(orderDTO.getTemplateOid());
CodeRuleVO ruleVO = ruleService.getObjectHasSecByOid(orderDTO.getCodeRuleOid());
+ final BladeUser user = AuthUtil.getUser();
//1.鍒ゆ柇瑙勫垯涓櫎浜嗘祦姘寸爜娈碉紝鏄惁鏈夊叾浠栫爜娈�
checkSecValueOnOrder(ruleVO, orderDTO);
//2.鍒ゆ柇蹇呰緭椤�
@@ -535,13 +537,13 @@
//cbo.setCreator(String.valueOf(AuthUtil.getUser().getUserId()));銆�
if(authUser) {
// 瑕佹眰鏄剧ず璐﹀彿锛屾墍浠ュ仛浜嗘洿鏀�
- cbo.setCreator(String.valueOf(AuthUtil.getUser().getAccount()));
- cbo.setLastModifier(String.valueOf(AuthUtil.getUser().getAccount()));
+ cbo.setCreator(String.valueOf(user.getAccount()));
+ cbo.setLastModifier(String.valueOf(user.getAccount()));
}else{
cbo.setCreator(orderDTO.getCreator());
cbo.setLastModifier(orderDTO.getLastModifier());
}
- cbo.setTenantId(AuthUtil.getTenantId());
+ cbo.setTenantId(user.getTenantId());
if(StringUtils.isNotBlank(orderDTO.getLcStatus())||StringUtils.isNotBlank(orderDTO.getData().get("lcStatus"))){
cbo.setLcStatus(StringUtils.isNotBlank(orderDTO.getLcStatus())?orderDTO.getLcStatus():orderDTO.getData().get("lcStatus"));
}
@@ -554,7 +556,7 @@
cbo.setDescription(orderDTO.getDescription());
cboList.add(cbo);
- List<String> codeList = productCodeService.productCodeAndSaveData(classifyFullInfo, templateVO, ruleVO, orderDTO.getSecDTOList(), cboList);
+ List<String> codeList = productCodeService.productCodeAndSaveData(classifyFullInfo, templateVO, ruleVO, orderDTO.getSecDTOList(), cboList,user);
batchSaveSelectChar(templateVO, cboList);
return codeList.size() > 0 ? codeList.get(0) : "";
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
index 9ec2f60..6cf3566 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
@@ -58,6 +58,7 @@
import org.apache.poi.ss.usermodel.RichTextString;
import org.apache.poi.ss.usermodel.Workbook;
import org.springblade.core.redis.cache.BladeRedis;
+import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
@@ -1206,6 +1207,7 @@
//SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo();
List<ClientBusinessObject> finalNeedSaveCboList = needSaveCboList;
CodeClassifyTemplateVO finalTemplateVO = templateVO;
+ final BladeUser user = AuthUtil.getUser();
ruleRowIndexMap.keySet().parallelStream().forEach(ruleOid -> {
//VciBaseUtil.setCurrentUserSessionInfo(sessionInfo);
List<String> rowIndexList = ruleRowIndexMap.get(ruleOid);
@@ -1222,7 +1224,7 @@
if (!CollectionUtils.isEmpty(thisCbos)) {
try {
// TODO 澶氱嚎绋嬫祦闂
- productCodeService.productCodeAndSaveData(classifyFullInfo, finalTemplateVO, ruleVOMap.get(ruleOid), null, dataCBOList);
+ productCodeService.productCodeAndSaveData(classifyFullInfo, finalTemplateVO, ruleVOMap.get(ruleOid), null, dataCBOList,user);
importCount.add(dataCBOList.size());
} catch (Throwable e) {
log.error("鎵归噺浜х敓缂栫爜鐨勬椂鍊欏嚭閿欎簡", e);
@@ -1674,7 +1676,7 @@
createRedisDatas(uuid + "-ok",templateVO, rowIndexCboMap, dataSet, fieldIndexMap, newErrorMap,true);
}else {
uuid="";
-
+ final BladeUser user = AuthUtil.getUser();
//瑕佹妸浠ヤ笂鐨勯敊璇殑閮芥姏鍑哄悗锛屽啀缁х画澶勭悊鏃堕棿鍜岀粍鍚堣鍒�
needSaveCboList = cboList.stream().filter(cbo -> {
String rowIndex = cbo.getAttributeValue(IMPORT_ROW_INDEX);
@@ -1694,7 +1696,7 @@
dataCBOIdList.add(baseModel.getOid());
});
try {
- codeList = productCodeService.productCodeAndSaveData(classifyFullInfo,templateVO,ruleVO, orderDTO.getSecDTOList(),dataCBOList);
+ codeList = productCodeService.productCodeAndSaveData(classifyFullInfo,templateVO,ruleVO, orderDTO.getSecDTOList(),dataCBOList,user);
//濡傛灉鏄紪鐮佺敓鎴愬け璐ワ紝鍒欑洿鎺ュ氨澶辫触浜嗭紝鍏朵粬鐨勫垽鏂嚭鏉ユ湁閿欒鐨勬垜浠兘缁熶竴杩斿洖鍒癳xcel閲岄潰
engineService.batchSaveSelectChar(templateVO, dataCBOList);
} catch (Exception e) {
@@ -2109,7 +2111,8 @@
}).collect(Collectors.toList());
List<ClientBusinessObject> finalNeedSaveCboList = needSaveCboList;
Map<String, CodeRuleVO> finalRuleVOMap = ruleVOMap;
- // TODO锛� 澶氱嚎绋嬫祦濂楀绾跨▼娴侊紝鏈夊潙锛屾垜鎶婅繖鍎挎敼浜�
+ // TODO锛� 澶氱嚎绋嬫祦濂楀绾跨▼娴侊紝鏈夊潙锛屾垜鎶婅繖鍎挎敼鎴愬崟绾跨▼浜�
+ final BladeUser user = AuthUtil.getUser();
ruleRowIndexMap.keySet().stream().forEach(ruleOid -> {
List <BaseModel>dataCBOList=new CopyOnWriteArrayList<>();
List<String> rowIndexList = ruleRowIndexMap.get(ruleOid);
@@ -2121,7 +2124,7 @@
dataCBOList.add(baseModel);
});
try {
- productCodeService.productCodeAndSaveData(classifyFullInfo, codeClassifyTemplateVO, finalRuleVOMap.get(ruleOid), null, dataCBOList);
+ productCodeService.productCodeAndSaveData(classifyFullInfo, codeClassifyTemplateVO, finalRuleVOMap.get(ruleOid), null, dataCBOList, user);
} catch (Throwable e) {
//success=false;
log.error("鎵归噺浜х敓缂栫爜鐨勬椂鍊欏嚭閿欎簡", e);
@@ -2134,6 +2137,7 @@
engineService.batchSaveSelectChar(codeClassifyTemplateVO, dataCBOList);
});
}else {
+ final BladeUser user = AuthUtil.getUser();
List<BaseModel> dataCBOList=new ArrayList<>();
List<ClientBusinessObject> needSaveCboList = cboList.stream().filter(cbo -> {
String rowIndex = cbo.getAttributeValue(IMPORT_ROW_INDEX);
@@ -2147,7 +2151,7 @@
dataCBOList.add(baseModel);
});
try {
- productCodeService.productCodeAndSaveData(classifyFullInfo, codeClassifyTemplateVO, ruleVO, orderDTO.getSecDTOList(), dataCBOList);
+ productCodeService.productCodeAndSaveData(classifyFullInfo, codeClassifyTemplateVO, ruleVO, orderDTO.getSecDTOList(), dataCBOList,user);
} catch (Exception e) {
log.error("鎵归噺浜х敓缂栫爜鐨勬椂鍊欏嚭閿欎簡", e);
needSaveCboList.stream().forEach(cbo -> {
@@ -2455,6 +2459,7 @@
List<String>allNeedSaveCboList=new ArrayList<>();
List<BaseModel> dataCBOList=new ArrayList<>();
+ final BladeUser user = AuthUtil.getUser();
needSaveCboList.stream().forEach(clientBusinessObject -> {
BaseModel baseModel=new BaseModel();
BeanUtil.convert(clientBusinessObject,baseModel);
@@ -2464,7 +2469,7 @@
});
try {
List<String>applyGroupCodeIdList=new ArrayList<>();
- productCodeService.productCodeAndSaveData(classifyFullInfo, templateVO, ruleVO, orderDTO.getSecDTOList(), dataCBOList);
+ productCodeService.productCodeAndSaveData(classifyFullInfo, templateVO, ruleVO, orderDTO.getSecDTOList(), dataCBOList,user);
//濡傛灉鏄紪鐮佺敓鎴愬け璐ワ紝鍒欑洿鎺ュ氨澶辫触浜嗭紝鍏朵粬鐨勫垽鏂嚭鏉ユ湁閿欒鐨勬垜浠兘缁熶竴杩斿洖鍒癳xcel閲岄潰
engineService.batchSaveSelectChar(templateVO, dataCBOList);
// if(!isProcess){
@@ -3337,7 +3342,7 @@
String oid=rowData.getOid();
String rowNumber=rowData.getRowIndex();
ClientBusinessObject cbo = new ClientBusinessObject();
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(cbo, classifyFullInfo.getTopClassifyVO().getBtmTypeId(),null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(cbo, classifyFullInfo.getTopClassifyVO().getBtmTypeId());
rowData.getData().forEach((index,value)->{
String field = fieldIndexMap.get(index);
if(StringUtils.isBlank(field)){
@@ -3443,7 +3448,7 @@
String fullPath = getFullPath(classifyFullInfo);
codeImprotDataVO.getDatas().stream().forEach(rowData -> {
ClientBusinessObject cbo=new ClientBusinessObject();
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(cbo, classifyFullInfo.getTopClassifyVO().getBtmTypeId(),null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(cbo, classifyFullInfo.getTopClassifyVO().getBtmTypeId());
rowData.forEach((field,value)->{
try {
cbo.setAttributeValueWithNoCheck(field,value);
@@ -3497,7 +3502,7 @@
String fullPath,boolean newCode){
rowDataList.stream().forEach(rowData -> {
ClientBusinessObject cbo=new ClientBusinessObject();
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(cbo, classifyFullInfo.getTopClassifyVO().getBtmTypeId(),null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(cbo, classifyFullInfo.getTopClassifyVO().getBtmTypeId());
rowData.getData().forEach((index,value)->{
String field = fieldIndexMap.get(index);
if (StringUtils.isBlank(field)) {
@@ -3554,7 +3559,7 @@
if (StringUtils.isBlank(field)) {
throw new VciBaseException("绗�" + (index + 1) + "鍒楃殑鏍囬鍦ㄧ郴缁熶腑涓嶅瓨鍦�");
}
- map.put(field,value);
+ map.put(field.toUpperCase(),value);
});
try {
@@ -4260,7 +4265,7 @@
Map<String,List<BaseModel>> indexTODataMap=new ConcurrentHashMap<>();
// 鏌ヨ涓嶉渶瑕佸弬涓庡叧閿睘鎬ф牎楠岀殑闄よ嚜宸变互澶栫殑鎵�鏈夊垎绫籵id
final String isParticipateCheckOids = classifyService.selectLeafByParentClassifyOid(classifyFullInfo.getTopClassifyVO().getOid(), classifyFullInfo.getCurrentClassifyVO().getOid());
- final HttpServletRequest request = org.springblade.core.tool.utils.WebUtil.getRequest();
+ final BladeUser user = AuthUtil.getUser();
List<ClientBusinessObject> repeatDataMap = cboList.parallelStream().filter(cbo -> {
//姣忚閮藉緱鏌ヨ.濡傛灉鍏朵腑鍑虹幇浜嗛敊璇紝鎴戜滑灏辩洿鎺ユ姏鍑哄紓甯革紝鍏朵綑鐨勬樉绀�
//VciBaseUtil.setCurrentUserSessionInfo(sessionInfo);
@@ -4286,7 +4291,7 @@
List<BaseModel> newCboList = new ArrayList<>();
newDataList.stream().forEach(stringStringMap -> {
BaseModel baseModel=new BaseModel();
- DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(stringStringMap,baseModel,request);
+ DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(stringStringMap,baseModel,user);
baseModel.setData(stringStringMap);
newCboList.add(baseModel);
});
@@ -4512,7 +4517,7 @@
List<ClientBusinessObject> clientBusinessObjectList=new ArrayList<>();
oldDataMap.stream().forEach(dataMap->{
ClientBusinessObject clientBusinessObject=new ClientBusinessObject();
- DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(dataMap,clientBusinessObject,null);
+ DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(dataMap,clientBusinessObject);
for (String key:dataMap.keySet()){
Object value= dataMap.getOrDefault(key,"");
clientBusinessObject.setAttributeValue(key.toLowerCase(Locale.ROOT),value==null?"":value.toString());
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 c6708e6..24bdc0c 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
@@ -36,6 +36,7 @@
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.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.WebUtil;
@@ -98,7 +99,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public List<String> productCodeAndSaveData(CodeClassifyFullInfoBO classifyFullInfoBO, CodeClassifyTemplateVO templateVO, CodeRuleVO ruleVO, List<CodeOrderSecDTO> secDTOList, List<BaseModel> dataCBOList) throws Exception {
+ public List<String> productCodeAndSaveData(CodeClassifyFullInfoBO classifyFullInfoBO, CodeClassifyTemplateVO templateVO, CodeRuleVO ruleVO, List<CodeOrderSecDTO> secDTOList, List<BaseModel> dataCBOList,BladeUser user) 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;
@@ -114,7 +115,6 @@
List<CodeAllCode> allCodeDOList = new CopyOnWriteArrayList<>();
Map<String/**娴佹按渚濇嵁**/, HashMap<String/**鐮佹鐨勪富閿�**/,String/**鏈�澶ф祦姘村彿**/>> maxSerialMap = new HashMap<>();
// TODO 澶氱嚎绋嬫祦寮曞彂鐨勯棶棰樺凡淇敼
- final HttpServletRequest request = WebUtil.getRequest();
dataCBOList.parallelStream().forEach(cbo->{
log.info("code:----->"+cbo.getId());
//VciBaseUtil.setCurrentUserSessionInfo(sessionInfo);
@@ -204,7 +204,7 @@
});
}
CodeAllCode allCodeDO = new CodeAllCode();
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(allCodeDO, MdmBtmTypeConstant.CODE_ALL_CODE,request);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(allCodeDO, MdmBtmTypeConstant.CODE_ALL_CODE,user);
allCodeDO.setCodeClassifyOid(classifyFullInfoBO.getCurrentClassifyVO().getOid());
allCodeDO.setCodeRuleOid(finalRuleVO.getOid());
allCodeDO.setId(cbo.getId());
@@ -237,13 +237,13 @@
log.info("oldmaxSerial--->"+serialValueDO.getMaxSerial()+"---- newmaxSerial---->"+maxSerial);
if(VciBaseUtil.getDouble(serialValueDO.getMaxSerial())<VciBaseUtil.getDouble(maxSerial)){
serialValueDO.setMaxSerial(String.valueOf(maxSerial));
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(serialValueDO,null);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(serialValueDO,user);
editSerialValueList.add(serialValueDO);
}
}else{
//娌℃湁
CodeSerialValue serialValueDO = new CodeSerialValue();
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(serialValueDO, MdmBtmTypeConstant.CODE_SERIAL_VALUE,request);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(serialValueDO, MdmBtmTypeConstant.CODE_SERIAL_VALUE,user);
serialValueDO.setCodeRuleOid(finalRuleVO.getOid());
serialValueDO.setSerialUnit(serialUnit);
serialValueDO.setCodeSecOid(secOid);
@@ -419,7 +419,7 @@
saveSerialValue( finalRuleVO, lastMaxSerialValueMap, maxSerialValueMap);
allCodeDOList.stream().forEach(
- allCode -> {DefaultAttrAssimtUtil.addDefaultAttrAssimt(allCode,"codeallcode",null);allCode.setLctid("codeAllCodeLC");}
+ allCode -> {DefaultAttrAssimtUtil.addDefaultAttrAssimt(allCode,"codeallcode",user);allCode.setLctid("codeAllCodeLC");}
);
@@ -982,7 +982,7 @@
BaseModel cbo, CodeClassifyTemplateVO templateVO,
List<CodeAllCode> allCodeDOList, String serialUnitString, String serialValueString,String codeDelimiter){
CodeAllCode allCodeDO = new CodeAllCode();
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(allCodeDO, MdmBtmTypeConstant.CODE_ALL_CODE,null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(allCodeDO, MdmBtmTypeConstant.CODE_ALL_CODE);
allCodeDO.setCodeClassifyOid(classifyFullInfoBO.getCurrentClassifyVO().getOid());
allCodeDO.setCodeRuleOid(ruleVO.getOid());
allCodeDO.setId(cbo.getId());
@@ -1015,11 +1015,11 @@
//璇存槑鏈�
serialValueDO = maxSerialValueMap.get(secOid).get(unit);
serialValueDO.setMaxSerial(maxSerial.toString());
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(serialValueDO,null);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(serialValueDO);
editSerialValueDOList.add(serialValueDO);
}else{
serialValueDO = new CodeSerialValue();
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(serialValueDO, MdmBtmTypeConstant.CODE_SERIAL_VALUE,null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(serialValueDO, MdmBtmTypeConstant.CODE_SERIAL_VALUE);
serialValueDO.setCodeRuleOid(ruleVO.getOid());
serialValueDO.setSerialUnit(unit);
serialValueDO.setCodeSecOid(secOid);
@@ -1249,7 +1249,7 @@
saveSerialValue( finalRuleVO, lastMaxSerialValueMap, maxSerialValueMap);
allCodeDOList.stream().forEach(
- allCode -> {DefaultAttrAssimtUtil.addDefaultAttrAssimt(allCode,"codeallcode",null);allCode.setLctid("codeAllCodeLC");}
+ allCode -> {DefaultAttrAssimtUtil.addDefaultAttrAssimt(allCode,"codeallcode");allCode.setLctid("codeAllCodeLC");}
);
Map<String, String> statusMap = allCodeDOList.stream().collect(Collectors.toMap(s -> s.getOid(), s -> s.getLcStatus()));
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
index a270828..f709207 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
@@ -2295,7 +2295,7 @@
List<ClientBusinessObject> clientBusinessObjectList=new ArrayList<>();
oldDataMap.stream().forEach(dataMap->{
ClientBusinessObject clientBusinessObject=new ClientBusinessObject();
- DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(dataMap,clientBusinessObject,null);
+ DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(dataMap,clientBusinessObject);
for (String key:dataMap.keySet()){
Object value= dataMap.getOrDefault(key,"");
clientBusinessObject.setAttributeValue(key.toLowerCase(Locale.ROOT),value==null?"":value.toString());
@@ -2320,7 +2320,7 @@
/***
- * 鏍规嵁绌垮叆鐨勫弬鏁颁俊鎭牎楠岀爜娈佃鍒�
+ * 鏍规嵁浼犲叆鐨勫弬鏁颁俊鎭牎楠岀爜娈佃鍒�
*/
private List<CodeOrderSecDTO> getRuleCodeOrderSecDTOs(List<SectionVO> SectionVOList,CodeRuleVO ruleVO,CodeClassifyFullInfoBO classifyFullInfo) throws Throwable{
List<CodeBasicSecVO> codeBasicSecVOS= ruleVO.getSecVOList();
@@ -2370,7 +2370,7 @@
CodeOrderSecDTO.setSecValue(sectypeValue);
codeOrderSecDTOList.add(CodeOrderSecDTO);
} else {
- message="浼犲叆鐨勭爜娈佃鍒欑己灏�" + name + "鐮佹";
+ message="浼犲叆鐨勭爜娈佃鍒欑己灏�" + name;
errorMap.put("error",errorMap.getOrDefault("error","")+";"+message);
}
}
--
Gitblit v1.9.3