From 41021633bfee5b5c9c57cb888423f3392c530f98 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 25 三月 2024 18:31:08 +0800
Subject: [PATCH] 业务类型bug修改，集成接口，远程部署等功能修改。
---
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java | 75 ++++++++++++++++++++++++++++---------
1 files changed, 57 insertions(+), 18 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..51b5770 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
@@ -1,7 +1,9 @@
package com.vci.ubcs.code.applyjtcodeservice.feigh;
import com.alibaba.cloud.commons.lang.StringUtils;
+import com.alibaba.fastjson.JSON;
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;
@@ -11,11 +13,14 @@
import com.vci.ubcs.starter.revision.model.BaseModel;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.util.MdmBtmTypeConstant;
+import com.vci.ubcs.starter.util.SaveLogUtil;
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.springblade.core.tool.utils.Func;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
@@ -35,8 +40,10 @@
@Data
@Slf4j
public class MdmInterJtClient implements IMdmInterJtClient {
+
@Value("${docking.apply.partCoe:10}")
public String partCoe;
+
/**
* 闆嗗洟鐢宠鍗曟湇鍔�
*/
@@ -57,6 +64,10 @@
*/
private final IDockingPreClassifyService dockingPreClassifyService;
+ /***
+ * 灞炴�ф槧灏勬湇鍔�
+ */
+ private final IDockingPreAttrMappingService dockingPreAttrMappingService;
/**
* 闆嗗洟鍙栧�艰寖鍥寸敵璇峰崟鏈嶅姟
@@ -70,6 +81,9 @@
@Autowired(required = false)
private IMdmEngineClient mdmEngineClient;
+
+ private final SaveLogUtil saveLogUtil;
+
/***
* 鐢宠闆嗗洟缂栫爜
* @return
@@ -81,6 +95,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
@@ -93,9 +123,7 @@
return R.fail("闆嗗洟鐮佹暟鎹慨鏀瑰け璐ワ細"+e.getMessage());
}
}
- /*
- * 涓绘暟鎹笟鍔℃湇鍔�
- */
+
/**
* 鑾峰彇闆嗗洟闆嗗洟鐮侊紝璧嬪�煎埌涓绘暟鎹�
* @param dockingReturnStoreVO
@@ -144,6 +172,7 @@
} else if ("9".equals(formState)) {
msg = "瀹℃牳涓�";
}
+ msg = Func.isNotBlank(mainData.getExamineOpinion()) ? mainData.getExamineOpinion():msg;
jcontent.put("applyId", applyId);
jcontent.put("formState", formState);
jcontent.put("customCoding", customCoding);
@@ -166,16 +195,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)) {
@@ -184,10 +220,14 @@
mdmEngineClient.updateBatchBtypeDatas(btmName, modeList);
});
}
- dockingPreApplyFormService.saveOrUpdateBatch(dockingPreApplyFormList);
+ if(!CollectionUtils.isEmpty(dockingPreApplyFormList)){
+ dockingPreApplyFormService.saveOrUpdateBatch(dockingPreApplyFormList);
+ }
+ saveLogUtil.operateLog("鐢宠鍗曠粨鏋滆繑鍥�",false,JSON.toJSONString(dockingReturnStoreVO.getMainData()));
}catch (Throwable e){
e.printStackTrace();
- return R.fail("闆嗗洟鐮侀泦鎴愯祴鍊煎け璐�"+e);
+ saveLogUtil.operateLog("鐢宠鍗曠粨鏋滆繑鍥�",true,"閿欒淇℃伅锛�"+e.getMessage()+"\n"+ JSON.toJSONString(dockingReturnStoreVO.getMainData()));
+ return R.fail("闆嗗洟鐮侀泦鎴愯祴鍊煎け璐ワ紝鍘熷洜锛�"+e.getMessage());
}
log.info("鑾峰彇闆嗗洟闆嗗洟鐮侊紝璧嬪�煎埌涓绘暟鎹� end");
return R.success("闆嗗洟鐮佽祴鍊兼垚鍔�");
@@ -265,14 +305,14 @@
throw new Throwable("瀛樺偍瑙嗗浘妯″瀷鍑虹幇闂");
}
}
+
/***
* 鑾峰彇鍒嗙被瑙嗗浘
*
* @param jclassObject
* @throws Throwable
*/
- private void getVilewMode(DockingClassifyVO jclassObject, List<DockingClassifyViewVO> list)
- throws Throwable {
+ private void getVilewMode(@NotNull DockingClassifyVO jclassObject, List<DockingClassifyViewVO> list) throws Throwable {
String nodeLinkName = jclassObject.getNodeLinkName();
try {
String jclassId =StringUtils.isBlank(jclassObject.getId())?"":jclassObject.getId();
@@ -286,7 +326,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);
@@ -320,7 +360,6 @@
throw new Throwable("缁勭粐鍒嗙被" + nodeLinkName + "妯″瀷瑙嗗浘瀛樺偍鍑虹幇闂");
}
}
-
/***
* 鑾峰彇妯″瀷瑙嗗浘灞炴��
--
Gitblit v1.9.3