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 | 52 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 39 insertions(+), 13 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 0924909..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;
@@ -56,8 +57,10 @@
* 闆嗗洟鍒嗙被鐢宠鍗曟湇鍔�
*/
private final IDockingPreClassifyService dockingPreClassifyService;
-
-
+ /***
+ * 灞炴�ф槧灏勬湇鍔�
+ */
+ private final IDockingPreAttrMappingService dockingPreAttrMappingService;
/**
* 闆嗗洟鍙栧�艰寖鍥寸敵璇峰崟鏈嶅姟
*/
@@ -81,6 +84,22 @@
return R.fail("闆嗗洟鐮佺敵璇峰け璐ワ細"+e.getMessage());
}
}
+
+ /***
+ * 鏌ヨ闆嗗洟灞炴�ф槧灏�
+ * @param codeClassifyOid:缂栫爜鍒嗙被oid
+ * @return
+ */
+ @Override
+ public R<List<DockingPreAttrMappingVO>> list_mapping(String codeClassifyOid) {
+ List<DockingPreAttrMapping> dockingPreAttrMappings= dockingPreAttrMappingService.selectByWrapper(Wrappers.<DockingPreAttrMapping>query().lambda().eq(DockingPreAttrMapping::getTargetClassifyId,codeClassifyOid));
+ List<DockingPreAttrMappingVO> dockingPreAttrMappingVOList=new ArrayList<>();
+ if(!CollectionUtils.isEmpty(dockingPreAttrMappings)){
+ dockingPreAttrMappingVOList=dockingPreAttrMappingService.dockingPreAttrMappingDO2VOS(dockingPreAttrMappings,true);
+ }
+ return R.data(dockingPreAttrMappingVOList);
+ }
+
/***
* 鐢宠闆嗗洟缂栫爜鏁版嵁缁存姢
* @return
@@ -166,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)) {
@@ -271,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 {
@@ -286,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);
--
Gitblit v1.9.3