From b40cd8c94978d43f9d13ba9ee93a4164b68a8165 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 05 十二月 2023 16:11:51 +0800
Subject: [PATCH] 赋默认值工具类修改，根据多线程流情况修改
---
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/impl/DockingSystemConfigServiceImpl.java | 6 +-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java | 21 +++---
Source/UBCS/ubcs-ops/ubcs-resource/src/main/java/com/vci/ubcs/resource/service/impl/FileServiceImpl.java | 2
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java | 27 +++++----
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeResembleRuleServiceImpl.java | 2
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/UniversalInterfaceImpl.java | 4 -
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemServiceImpl.java | 4
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/CodeRuleCharacterServiceImpl.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
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java | 20 +++---
14 files changed, 79 insertions(+), 77 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 5cba891..9b9d106 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);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(fileObject, MdmBtmTypeConstant.FILE_OBJECT,null);
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 383a2aa..7c77831 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,5 +1,6 @@
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;
@@ -7,7 +8,10 @@
import org.apache.poi.ss.formula.functions.T;
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;
@@ -33,7 +37,7 @@
* @return
* @throws VciBaseException
*/
- public static <T extends BaseModel> T addDefaultAttrAssimt(T object,String btmName) throws VciBaseException {
+ public static <T extends BaseModel> T addDefaultAttrAssimt(T object, String btmName, HttpServletRequest request/*涓嶅湪澶氱嚎绋嬫祦涓娇鐢ㄥ氨涓嶉渶瑕佷紶request*/) throws VciBaseException {
BaseModel baseModel = object;
try {
baseModel.setOid(VciBaseUtil.getPk());
@@ -42,10 +46,9 @@
baseModel.setLastModifyTime(new Date());
baseModel.setTs(new Date());
baseModel.setRevisionOid(VciBaseUtil.getPk());
- // 鐢ㄦ埛id
- // String userId = AuthUtil.getUserId().toString();
+ String account = Func.isEmpty(request) ? AuthUtil.getUser().getAccount() : AuthUtil.getUser(request).getAccount();
baseModel.setBtmname(btmName);
- baseModel.setCreator(AuthUtil.getUser().getAccount());
+ baseModel.setCreator(account);
baseModel.setFirstR("1");
baseModel.setFirstV("1");
baseModel.setLastR("1");
@@ -54,17 +57,17 @@
// TODO:鐩墠鍙湁缂栫爜瑙勫垯涓湁鐢ㄥ埌锛屽悗鏈熼渶瑕佸幓鎺夎繖娈典唬鐮佺殑璇濓紝灏辨妸浠栧姞鍦ㄧ紪鐮佽鍒欐柊澧炰腑鍘�
if(Func.isBlank(baseModel.getOwner())){
// 璁剧疆鎵�鏈夎��
- baseModel.setOwner(AuthUtil.getUserId().toString());
+ baseModel.setOwner(Func.isEmpty(request) ? AuthUtil.getUserId().toString():AuthUtil.getUserId(request).toString());
}
baseModel.setVersionSeq(1);
baseModel.setVersionRule("0");
baseModel.setVersionValue("1");
baseModel.setRevisionOid(VciBaseUtil.getPk());
- baseModel.setLastModifier(AuthUtil.getUser().getAccount());
+ baseModel.setLastModifier(account);
baseModel.setRevisionValue("1");
baseModel.setRevisionRule("1");
- baseModel.setTenantId(AuthUtil.getTenantId());
+ baseModel.setTenantId(Func.isEmpty(request) ? AuthUtil.getTenantId():AuthUtil.getTenantId(request));
}catch (VciBaseException e){
e.printStackTrace();
}
@@ -78,7 +81,7 @@
* @return
* @throws VciBaseException
*/
- public static <T extends BaseModel> T updateDefaultAttrAssimt(T object) throws VciBaseException {
+ public static <T extends BaseModel> T updateDefaultAttrAssimt(T object,HttpServletRequest request) throws VciBaseException {
BaseModel baseModel = object;
try {
baseModel.setLastModifyTime(new Date());
@@ -86,7 +89,7 @@
// 鐢ㄦ埛id
// String userId = AuthUtil.getUserId().toString();
// 瑕佹眰鏀规垚璐﹀彿
- String account = AuthUtil.getUserAccount();
+ String account = Func.isEmpty(request) ? AuthUtil.getUser().getAccount() : AuthUtil.getUser(request).getAccount();
baseModel.setLastModifier(account);
}catch (VciBaseException e){
e.printStackTrace();
@@ -101,7 +104,7 @@
* @return
* @throws VciBaseException
*/
- public static <T extends BaseModel> T copplyDefaultAttrAssimt(Map<String,String> dataMap, T object) throws VciBaseException {
+ public static <T extends BaseModel> T copplyDefaultAttrAssimt(Map<String,String> dataMap, T object,HttpServletRequest request) throws VciBaseException {
BaseModel baseModel = object;
try {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -112,7 +115,7 @@
Object value=dataMap.get(key);
newDataMap.put(key.toLowerCase(Locale.ROOT),value);
}*/
- /* dataMap.forEach((key,value)->{
+ /* dataMap.forEach((key,value)->{
newDataMap.put(key.toLowerCase(Locale.ROOT),value);
});*/
//baseModel.setData((Map)newDataMap);
@@ -155,7 +158,7 @@
baseModel.setVersionRule(dataMap.getOrDefault("VERSIONRULE",""));
baseModel.setVersionValue(dataMap.getOrDefault("VERSIONVALUE",""));
baseModel.setRevisionOid(dataMap.getOrDefault("REVISIONOID",""));
- baseModel.setLastModifier(AuthUtil.getUser().getAccount());
+ baseModel.setLastModifier(Func.isEmpty(request) ? AuthUtil.getUser().getAccount() : AuthUtil.getUser(request).getAccount());
baseModel.setLcStatus(dataMap.getOrDefault("LCSTATUS",""));
baseModel.setName(dataMap.getOrDefault("NAME",""));
baseModel.setTenantId(dataMap.getOrDefault("TENADTID",""));
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 42e4177..310f5bc 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);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreClassify, MdmBtmTypeConstant.DOCKING_PRE_JCLASSIFY,null);
} else {
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreClassify);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreClassify,null);
}
dockingPreClassify.setOid(id);
dockingPreClassify.setName(className);
@@ -314,10 +314,10 @@
jviewModelObject = jviewmodelMap.get(viewName);
//褰卞搷缂栫爜椤圭殑鏁版嵁
jviewModelObject.setImpactList(impactList);
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(jviewModelObject);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(jviewModelObject,null);
} else {
jviewModelObject =new DockingPreViewModel();
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(jviewModelObject,MdmBtmTypeConstant.DOCKING_PRE_JVIEWMODEL);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(jviewModelObject,MdmBtmTypeConstant.DOCKING_PRE_JVIEWMODEL,null);
jviewModelObject.setSourceClassifyId(jclassId);// 闆嗗洟鍒嗙被id
jviewModelObject.setViewName(viewName);// 闆嗗洟瑙嗗浘鍚嶇О
//褰卞搷缂栫爜椤圭殑鏁版嵁
@@ -372,9 +372,9 @@
dockingPreMetaAttr = jmetaattrMap.get(englishName);
dockingPreMetaAttr.setChineseName(chineseName);
dockingPreMetaAttr.setDefaultValue(defaultValue);
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreMetaAttr);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreMetaAttr,null);
} else {
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreMetaAttr,MdmBtmTypeConstant.DOCKING_PRE_JMETAATRR);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreMetaAttr,MdmBtmTypeConstant.DOCKING_PRE_JMETAATRR,null);
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);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(rangeObject,null);
} else {
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(rangeObject,MdmBtmTypeConstant.DOCKING_PRE_JRANGE);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(rangeObject,MdmBtmTypeConstant.DOCKING_PRE_JRANGE,null);
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 0711970..4fd3f46 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);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreAttrMapping,null);
}else{
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreAttrMapping, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreAttrMapping, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM,null);
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 3db3194..48825a9 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);
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel,null);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel,null);
baseModel.getData().getOrDefault("groupCode", customCoding);
updateCbos.add(baseModel);//鏇存柊鏁版嵁闆嗗洟code
@@ -189,14 +189,14 @@
dockingPreApplyForm.setMsg("鐢宠锛�" + msg);
dockingPreApplyForm.setContent("");
dockingPreApplyForm.setGroupCode("");
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm,null);
});
addDockingPreApplyFormMap.forEach((key, dockingPreApplyForm) -> {
dockingPreApplyForm.setCode("2");
dockingPreApplyForm.setMsg("鐢宠锛�" + msg);
dockingPreApplyForm.setContent("");
dockingPreApplyForm.setGroupCode("");
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM,null);
});
}
if (editDockingPreApplyFormMap.size() > 0) {
@@ -300,7 +300,7 @@
if(partCoe.equals(classOid)){
baseModel.setId(10+customCoding);
}
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel,null);
// 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);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm,null);
});
addDockingPreApplyFormMap.forEach((key, dockingPreApplyForm) -> {
dockingPreApplyForm.setCode("2");
dockingPreApplyForm.setMsg("淇敼锛�" + msg);
dockingPreApplyForm.setContent("");
dockingPreApplyForm.setGroupCode("");
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM,null);
});
}
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);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreClassify,MdmBtmTypeConstant.DOCKING_PRE_JCLASSIFY,null);
} else {
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreClassify);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreClassify,null);
}
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);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreClassify,MdmBtmTypeConstant.DOCKING_PRE_JCLASSIFY,null);
} else {
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreClassify);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreClassify,null);
}
dockingPreClassify.setOid(id);
dockingPreClassify.setName(className);
@@ -660,10 +660,10 @@
jviewModelObject = jviewmodelMap.get(viewName);
//褰卞搷缂栫爜椤圭殑鏁版嵁
jviewModelObject.setImpactList(impactList);
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(jviewModelObject);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(jviewModelObject,null);
} else {
jviewModelObject =new DockingPreViewModel();
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(jviewModelObject,MdmBtmTypeConstant.DOCKING_PRE_JVIEWMODEL);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(jviewModelObject,MdmBtmTypeConstant.DOCKING_PRE_JVIEWMODEL,null);
jviewModelObject.setSourceClassifyId(jclassId);// 闆嗗洟鍒嗙被id
jviewModelObject.setViewName(viewName);// 闆嗗洟瑙嗗浘鍚嶇О
//褰卞搷缂栫爜椤圭殑鏁版嵁
@@ -718,9 +718,9 @@
dockingPreMetaAttr = jmetaattrMap.get(englishName);
dockingPreMetaAttr.setChineseName(chineseName);
dockingPreMetaAttr.setDefaultValue(defaultValue);
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreMetaAttr);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreMetaAttr,null);
} else {
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreMetaAttr,MdmBtmTypeConstant.DOCKING_PRE_JMETAATRR);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreMetaAttr,MdmBtmTypeConstant.DOCKING_PRE_JMETAATRR,null);
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);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(rangeObject,null);
} else {
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(rangeObject,MdmBtmTypeConstant.DOCKING_PRE_JRANGE);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(rangeObject,MdmBtmTypeConstant.DOCKING_PRE_JRANGE,null);
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/impl/CodeResembleRuleServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeResembleRuleServiceImpl.java
index 034a62b..8aff713 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);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeResembleRuleDO, MdmBtmTypeConstant.CODE_RESEMBLE_RULE,null);
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 edff3be..7bc8308 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");
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeRuleCharacter,"character",null);
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 6b963c6..8045c13 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);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeRule, MdmBtmTypeConstant.CODE_RULE,null);
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);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeRule,null);
return R.status(codeRuleMapper.updateById(codeRule)>0);
}
@@ -518,7 +518,7 @@
}
VciBaseUtil.alertNotNull(codeRuleDTO, "闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄");
CodeRule codeRuleDO = new CodeRule();
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeRuleDO,MdmBtmTypeConstant.CODE_RULE);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeRuleDO,MdmBtmTypeConstant.CODE_RULE,null);
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);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeBasicSecDO,MdmBtmTypeConstant.CODE_BASIC_SEC,null);
// 鍥哄畾鐮佹
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);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(item,null);
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 888ea09..8941dd3 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);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeTemplatePhaseDO, MdmBtmTypeConstant.CODE_TEMPLATE_PHASE,null);
//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);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeTemplatePhaseEntityDO,null);
//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 e0ac426..0d4ee95 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);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(sysIntParamDO, MdmBtmTypeConstant.SYS_INT_PARAMTERY,null);
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);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingSysIntHeader,MdmBtmTypeConstant.SYS_INT_HEADER,null);
sysIntHeaderList.add(dockingSysIntHeader);
});
}
dockingSysIntParamService.saveBatch(sysIntParamList);
dockingSysIntHeaderService.saveBatch(sysIntHeaderList);
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingSystemConfig,MdmBtmTypeConstant.SYS_INT_INFO);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingSystemConfig,MdmBtmTypeConstant.SYS_INT_INFO,null);
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 1186d51..325c9e7 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);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingSystem, MdmBtmTypeConstant.SYS_INT_BASE,null);
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);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingSystem,null);
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/MdmIOServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
index 0090df0..7a4942f 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
@@ -6,13 +6,11 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.google.protobuf.ServiceException;
-import com.vci.ubcs.code.applyjtcodeservice.entity.DockingPreAttrMapping;
import com.vci.ubcs.code.applyjtcodeservice.feign.IMdmInterJtClient;
import com.vci.ubcs.code.applyjtcodeservice.vo.DockingPreAttrMappingVO;
import com.vci.ubcs.code.bo.AttributeValue;
import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
import com.vci.ubcs.code.bo.CodeTemplateAttrSqlBO;
-import com.vci.ubcs.code.constant.MdmEngineConstant;
import com.vci.ubcs.code.dto.*;
import com.vci.ubcs.code.entity.CodeAllCode;
import com.vci.ubcs.code.enumpack.CodeDefaultLC;
@@ -71,6 +69,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import java.beans.BeanInfo;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
@@ -88,7 +87,6 @@
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
import static com.alibaba.druid.util.FnvHash.Constants.LIMIT;
@@ -382,7 +380,7 @@
CodeClassifyVO codeClassifyVO = classifyService.getObjectByOid(codeClassifyOid);
//鑾峰彇鐮佹瀹藉害
- String secWidth = getCodeSegmentWidth(codeClassifyVO.getOid());
+ //String secWidth = getCodeSegmentWidth(codeClassifyVO.getOid());
if(isHistory){
templateVOList= templateService.childTemplates(codeClassifyOid);
@@ -2120,7 +2118,8 @@
}).collect(Collectors.toList());
List<ClientBusinessObject> finalNeedSaveCboList = needSaveCboList;
Map<String, CodeRuleVO> finalRuleVOMap = ruleVOMap;
- ruleRowIndexMap.keySet().parallelStream().forEach(ruleOid -> {
+ // TODO锛� 澶氱嚎绋嬫祦濂楀绾跨▼娴侊紝鏈夊潙锛屾垜鎶婅繖鍎挎敼浜�
+ ruleRowIndexMap.keySet().stream().forEach(ruleOid -> {
List <BaseModel>dataCBOList=new CopyOnWriteArrayList<>();
List<String> rowIndexList = ruleRowIndexMap.get(ruleOid);
List<ClientBusinessObject> thisCbos = needSaveCboList.stream().filter(cbo -> rowIndexList.contains(cbo.getAttributeValue(IMPORT_ROW_INDEX)) && !errorMap.containsKey(cbo.getAttributeValue(IMPORT_ROW_INDEX))).collect(Collectors.toList());
@@ -2502,7 +2501,6 @@
resultDataObjectDetailDO.setErrorid("0");
}
resultDataObjectDetailDO.setId(sourceOid);
-
resultDataObjectDetailDO.setMsg(msg);
resultDataObjectDetailDOs.add(resultDataObjectDetailDO);
//澶勭悊浼犻�佺殑鏁版嵁涓叧閿睘鎬ч噸澶嶇殑锛岀洿鎺ユ嬁鍒板凡缁忕敵璇峰埌缂栫爜鐨勬暟鎹紪鐮佺洿鎺ュ皢璧嬬粰鍏抽敭灞炴�ч噸澶嶇殑鏁版嵁
@@ -3348,7 +3346,7 @@
String oid=rowData.getOid();
String rowNumber=rowData.getRowIndex();
ClientBusinessObject cbo = new ClientBusinessObject();
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(cbo, classifyFullInfo.getTopClassifyVO().getBtmTypeId());
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(cbo, classifyFullInfo.getTopClassifyVO().getBtmTypeId(),null);
rowData.getData().forEach((index,value)->{
String field = fieldIndexMap.get(index);
if(StringUtils.isBlank(field)){
@@ -3454,7 +3452,7 @@
String fullPath = getFullPath(classifyFullInfo);
codeImprotDataVO.getDatas().stream().forEach(rowData -> {
ClientBusinessObject cbo=new ClientBusinessObject();
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(cbo, classifyFullInfo.getTopClassifyVO().getBtmTypeId());
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(cbo, classifyFullInfo.getTopClassifyVO().getBtmTypeId(),null);
rowData.forEach((field,value)->{
try {
cbo.setAttributeValueWithNoCheck(field,value);
@@ -3508,7 +3506,7 @@
String fullPath,boolean newCode){
rowDataList.stream().forEach(rowData -> {
ClientBusinessObject cbo=new ClientBusinessObject();
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(cbo, classifyFullInfo.getTopClassifyVO().getBtmTypeId());
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(cbo, classifyFullInfo.getTopClassifyVO().getBtmTypeId(),null);
rowData.getData().forEach((index,value)->{
String field = fieldIndexMap.get(index);
if (StringUtils.isBlank(field)) {
@@ -4271,6 +4269,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();
List<ClientBusinessObject> repeatDataMap = cboList.parallelStream().filter(cbo -> {
//姣忚閮藉緱鏌ヨ.濡傛灉鍏朵腑鍑虹幇浜嗛敊璇紝鎴戜滑灏辩洿鎺ユ姏鍑哄紓甯革紝鍏朵綑鐨勬樉绀�
//VciBaseUtil.setCurrentUserSessionInfo(sessionInfo);
@@ -4296,7 +4295,7 @@
List<BaseModel> newCboList = new ArrayList<>();
newDataList.stream().forEach(stringStringMap -> {
BaseModel baseModel=new BaseModel();
- DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(stringStringMap,baseModel);
+ DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(stringStringMap,baseModel,request);
baseModel.setData(stringStringMap);
newCboList.add(baseModel);
});
@@ -4522,7 +4521,7 @@
List<ClientBusinessObject> clientBusinessObjectList=new ArrayList<>();
oldDataMap.stream().forEach(dataMap->{
ClientBusinessObject clientBusinessObject=new ClientBusinessObject();
- DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(dataMap,clientBusinessObject);
+ DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(dataMap,clientBusinessObject,null);
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 42fab2c..c6708e6 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
@@ -38,6 +38,7 @@
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.WebUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@@ -45,6 +46,7 @@
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import java.lang.reflect.Method;
import java.util.*;
import java.util.concurrent.CopyOnWriteArrayList;
@@ -112,6 +114,7 @@
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);
@@ -201,7 +204,7 @@
});
}
CodeAllCode allCodeDO = new CodeAllCode();
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(allCodeDO, MdmBtmTypeConstant.CODE_ALL_CODE);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(allCodeDO, MdmBtmTypeConstant.CODE_ALL_CODE,request);
allCodeDO.setCodeClassifyOid(classifyFullInfoBO.getCurrentClassifyVO().getOid());
allCodeDO.setCodeRuleOid(finalRuleVO.getOid());
allCodeDO.setId(cbo.getId());
@@ -234,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);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(serialValueDO,null);
editSerialValueList.add(serialValueDO);
}
}else{
//娌℃湁
CodeSerialValue serialValueDO = new CodeSerialValue();
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(serialValueDO, MdmBtmTypeConstant.CODE_SERIAL_VALUE);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(serialValueDO, MdmBtmTypeConstant.CODE_SERIAL_VALUE,request);
serialValueDO.setCodeRuleOid(finalRuleVO.getOid());
serialValueDO.setSerialUnit(serialUnit);
serialValueDO.setCodeSecOid(secOid);
@@ -261,7 +264,6 @@
}
//澶勭悊allCode
if(!CollectionUtils.isEmpty(allCodeDOList)){
- // TODO 鍘嗗彶鏁版嵁瀵煎叆鐨勬椂鍊欒繖鍎垮伓灏斾細瑙﹀彂绌烘寚閽堝紓甯�
Map<String,List<CodeAllCode>> ruleGroup = allCodeDOList.stream().collect(Collectors.groupingBy(s -> s.getCodeRuleOid()));
Map<String, CodeAllCode> codeDOMap = allCodeDOList.stream().collect(Collectors.toMap(s -> s.getCodeRuleOid() + "${SEP}" + s.getId(), t -> t));
List<CodeAllCode> addCodeDOs = new CopyOnWriteArrayList<>();
@@ -417,7 +419,7 @@
saveSerialValue( finalRuleVO, lastMaxSerialValueMap, maxSerialValueMap);
allCodeDOList.stream().forEach(
- allCode -> {DefaultAttrAssimtUtil.addDefaultAttrAssimt(allCode,"codeallcode");allCode.setLctid("codeAllCodeLC");}
+ allCode -> {DefaultAttrAssimtUtil.addDefaultAttrAssimt(allCode,"codeallcode",null);allCode.setLctid("codeAllCodeLC");}
);
@@ -980,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);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(allCodeDO, MdmBtmTypeConstant.CODE_ALL_CODE,null);
allCodeDO.setCodeClassifyOid(classifyFullInfoBO.getCurrentClassifyVO().getOid());
allCodeDO.setCodeRuleOid(ruleVO.getOid());
allCodeDO.setId(cbo.getId());
@@ -1013,11 +1015,11 @@
//璇存槑鏈�
serialValueDO = maxSerialValueMap.get(secOid).get(unit);
serialValueDO.setMaxSerial(maxSerial.toString());
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(serialValueDO);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(serialValueDO,null);
editSerialValueDOList.add(serialValueDO);
}else{
serialValueDO = new CodeSerialValue();
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(serialValueDO, MdmBtmTypeConstant.CODE_SERIAL_VALUE);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(serialValueDO, MdmBtmTypeConstant.CODE_SERIAL_VALUE,null);
serialValueDO.setCodeRuleOid(ruleVO.getOid());
serialValueDO.setSerialUnit(unit);
serialValueDO.setCodeSecOid(secOid);
@@ -1247,7 +1249,7 @@
saveSerialValue( finalRuleVO, lastMaxSerialValueMap, maxSerialValueMap);
allCodeDOList.stream().forEach(
- allCode -> {DefaultAttrAssimtUtil.addDefaultAttrAssimt(allCode,"codeallcode");allCode.setLctid("codeAllCodeLC");}
+ allCode -> {DefaultAttrAssimtUtil.addDefaultAttrAssimt(allCode,"codeallcode",null);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 a51667b..a270828 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
@@ -281,9 +281,7 @@
UserVO userVo = interParameterVO.getData().getUser();
//鍏嶅瘑鐧诲綍鐢宠token锛宺equest涓坊鍔犵敤鎴蜂俊鎭�
- //passwordFreeLoginService.pwdFreeLoginByBoolean(userVo.getUserName(),this.getRequest());
passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(Locale.ROOT),this.getRequest());
- AuthUtil.getUser();
List<ClassfyVO> classVOList = classfysVO.getClassify();
InterParameterVO finalInterParameterVO = interParameterVO;
//杩欐槸璐﹀彿淇℃伅
@@ -2297,7 +2295,7 @@
List<ClientBusinessObject> clientBusinessObjectList=new ArrayList<>();
oldDataMap.stream().forEach(dataMap->{
ClientBusinessObject clientBusinessObject=new ClientBusinessObject();
- DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(dataMap,clientBusinessObject);
+ DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(dataMap,clientBusinessObject,null);
for (String key:dataMap.keySet()){
Object value= dataMap.getOrDefault(key,"");
clientBusinessObject.setAttributeValue(key.toLowerCase(Locale.ROOT),value==null?"":value.toString());
--
Gitblit v1.9.3