From a475adaeba4b9954ed19f5ece005e95971ed4b0e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期日, 04 二月 2024 13:03:38 +0800
Subject: [PATCH] 内外网开发环境代码合并
---
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java | 46 +++++++++++++++++++++++++++-------------------
1 files changed, 27 insertions(+), 19 deletions(-)
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..efecb25 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
@@ -14,6 +14,7 @@
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springframework.beans.factory.annotation.Autowired;
@@ -184,16 +185,23 @@
String jdatabtmname = dockingPreApplyForm.getDataBtmName();
if (res) {
//姝ゅ闇�瑕佹煡璇笟鍔℃暟鎹紝鍘绘洿鏀�
- BaseModel baseModel = new BaseModel();
- String classOid=baseModel.getData().getOrDefault("CODECLSFID","");
- if(partCoe.equals(classOid)){
- baseModel.setId(10+customCoding);
+ R<List<BaseModel>> R=mdmEngineClient.selectByTypeAndOid(jdatabtmname,jdataid);
+ if(R.isSuccess()){
+ List<BaseModel> oldDatalist=new ArrayList<>();
+ List<BaseModel> newDatalist=R.getData();
+ if(!CollectionUtils.isEmpty(newDatalist)){
+ if(editObjectMap.containsKey(jdatabtmname)){
+ oldDatalist=editObjectMap.getOrDefault(jdatabtmname,new ArrayList<>());
+ }
+ BaseModel baseModel=oldDatalist.get(0);
+ //DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
+ baseModel.setLastModifyTime(new Date());
+ baseModel.getData().put("groupcode",customCoding);
+ log.info("鐢宠鍗�:"+applyId+",闆嗗洟鐮侊細"+customCoding+"缂栫爜锛�"+baseModel.getId());
+ oldDatalist.add(baseModel);
+ editObjectMap.put(jdatabtmname,oldDatalist);
+ }
}
- String btmeName=baseModel.getBtmname();
- baseModel.getData().put("groupcode",customCoding);
- log.info("鐢宠鍗�:"+applyId+",闆嗗洟鐮侊細"+customCoding+"缂栫爜锛�"+baseModel.getId());
- editObjectMap.getOrDefault(btmeName,new ArrayList<>()).add(baseModel);
-
}
}
if(!CollectionUtils.isEmpty(editObjectMap)) {
@@ -258,9 +266,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);
@@ -289,7 +297,7 @@
* @param jclassObject
* @throws Throwable
*/
- private void getVilewMode(DockingClassifyVO jclassObject, List<DockingClassifyViewVO> list)
+ private void getVilewMode(@NotNull DockingClassifyVO jclassObject, List<DockingClassifyViewVO> list)
throws Throwable {
String nodeLinkName = jclassObject.getNodeLinkName();
try {
@@ -304,7 +312,7 @@
for (DockingClassifyViewVO viewInfo : list) {
String viewName =StringUtils.isBlank(viewInfo.getViewName())?"":viewInfo.getViewName();
- String impactList = StringUtils.isBlank(viewInfo.getImpactList())?"":viewInfo.getImpactList();
+ String impactList = viewInfo.getImpactList() == null ? "" : viewInfo.getImpactList().get(0).get(0);
log.info("VilewMode:-------------->瑙嗗浘鍚嶇О:"+viewName);
log.info("VilewMode:-------------->褰卞搷缂栫爜椤�:"+impactList);
log.info("VilewMode:--------------> 闆嗗洟鍒嗙被涓婚敭:"+jclassId);
@@ -314,10 +322,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 +380,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 +444,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());
--
Gitblit v1.9.3