From 309de8506f5e08dea1c8fdd0d377f0884aa21dd7 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 18 三月 2024 18:21:39 +0800
Subject: [PATCH] 集成相关更改
---
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 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 c2aaae4..344f981 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
@@ -2,6 +2,7 @@
import com.alibaba.cloud.commons.lang.StringUtils;
import com.alibaba.fastjson.JSONObject;
+import com.alibaba.nacos.shaded.com.google.protobuf.ServiceException;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.vci.ubcs.code.applyjtcodeservice.entity.*;
import com.vci.ubcs.code.applyjtcodeservice.feign.IMdmInterJtClient;
@@ -36,8 +37,10 @@
@Data
@Slf4j
public class MdmInterJtClient implements IMdmInterJtClient {
+
@Value("${docking.apply.partCoe:10}")
public String partCoe;
+
/**
* 闆嗗洟鐢宠鍗曟湇鍔�
*/
@@ -57,10 +60,12 @@
* 闆嗗洟鍒嗙被鐢宠鍗曟湇鍔�
*/
private final IDockingPreClassifyService dockingPreClassifyService;
+
/***
* 灞炴�ф槧灏勬湇鍔�
*/
private final IDockingPreAttrMappingService dockingPreAttrMappingService;
+
/**
* 闆嗗洟鍙栧�艰寖鍥寸敵璇峰崟鏈嶅姟
*/
@@ -73,6 +78,7 @@
@Autowired(required = false)
private IMdmEngineClient mdmEngineClient;
+
/***
* 鐢宠闆嗗洟缂栫爜
* @return
@@ -112,6 +118,7 @@
return R.fail("闆嗗洟鐮佹暟鎹慨鏀瑰け璐ワ細"+e.getMessage());
}
}
+
/*
* 涓绘暟鎹笟鍔℃湇鍔�
*/
@@ -185,16 +192,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)) {
@@ -203,10 +217,12 @@
mdmEngineClient.updateBatchBtypeDatas(btmName, modeList);
});
}
- dockingPreApplyFormService.saveOrUpdateBatch(dockingPreApplyFormList);
+ if(!CollectionUtils.isEmpty(dockingPreApplyFormList)){
+ dockingPreApplyFormService.saveOrUpdateBatch(dockingPreApplyFormList);
+ }
}catch (Throwable e){
e.printStackTrace();
- return R.fail("闆嗗洟鐮侀泦鎴愯祴鍊煎け璐�"+e);
+ return R.fail("闆嗗洟鐮侀泦鎴愯祴鍊煎け璐ワ紝鍘熷洜锛�"+e.getMessage());
}
log.info("鑾峰彇闆嗗洟闆嗗洟鐮侊紝璧嬪�煎埌涓绘暟鎹� end");
return R.success("闆嗗洟鐮佽祴鍊兼垚鍔�");
@@ -284,6 +300,7 @@
throw new Throwable("瀛樺偍瑙嗗浘妯″瀷鍑虹幇闂");
}
}
+
/***
* 鑾峰彇鍒嗙被瑙嗗浘
*
@@ -339,7 +356,6 @@
throw new Throwable("缁勭粐鍒嗙被" + nodeLinkName + "妯″瀷瑙嗗浘瀛樺偍鍑虹幇闂");
}
}
-
/***
* 鑾峰彇妯″瀷瑙嗗浘灞炴��
--
Gitblit v1.9.3