From 68ea1b1eb9e8c48b44369528792ead8726571716 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期五, 29 十二月 2023 10:59:01 +0800
Subject: [PATCH] 1、erp接口集成的改动与集团集成的改动功能。
---
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java | 51 +++++++++++++++++++++++++++++----------------------
1 files changed, 29 insertions(+), 22 deletions(-)
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 48825a9..3e9a87c 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,null);
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel,null);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
baseModel.getData().getOrDefault("groupCode", customCoding);
updateCbos.add(baseModel);//鏇存柊鏁版嵁闆嗗洟code
@@ -189,14 +189,14 @@
dockingPreApplyForm.setMsg("鐢宠锛�" + msg);
dockingPreApplyForm.setContent("");
dockingPreApplyForm.setGroupCode("");
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm,null);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm);
});
addDockingPreApplyFormMap.forEach((key, dockingPreApplyForm) -> {
dockingPreApplyForm.setCode("2");
dockingPreApplyForm.setMsg("鐢宠锛�" + msg);
dockingPreApplyForm.setContent("");
dockingPreApplyForm.setGroupCode("");
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM,null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
});
}
if (editDockingPreApplyFormMap.size() > 0) {
@@ -238,6 +238,11 @@
//List<BaseModelVO> codeWupins=mdmEngineService.listByIds(VciBaseUtil.str2List(oids));
List<BaseModel> dataModelList = new ArrayList<>();
try {
+ R<List<BaseModel>> listR = mdmEngineClient.selectByTypeAndOid(btmName, oids);
+ if(listR.getData().size() == 0){
+ return R.fail("涓烘煡璇㈠埌鐩稿叧涓氬姟鏁版嵁锛�");
+ }
+ dataModelList = listR.getData();
if (!CollectionUtils.isEmpty(dataModelList)) {
DockingGroupDataVO dockingGroupDataVO = new DockingGroupDataVO();
//鐢宠鍗曞拰鐢宠鍗曞璞″叧绯�
@@ -300,7 +305,7 @@
if(partCoe.equals(classOid)){
baseModel.setId(10+customCoding);
}
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel,null);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
// baseModel.setId(customCoding);
baseModel.getData().put("groupCode", customCoding);
updateCbos.add(baseModel);//鏇存柊鏁版嵁闆嗗洟code
@@ -313,14 +318,14 @@
dockingPreApplyForm.setMsg("淇敼锛�" + msg);
dockingPreApplyForm.setContent("");
dockingPreApplyForm.setGroupCode("");
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm,null);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm);
});
addDockingPreApplyFormMap.forEach((key, dockingPreApplyForm) -> {
dockingPreApplyForm.setCode("2");
dockingPreApplyForm.setMsg("淇敼锛�" + msg);
dockingPreApplyForm.setContent("");
dockingPreApplyForm.setGroupCode("");
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM,null);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
});
}
if (editDockingPreApplyFormMap.size() > 0) {
@@ -439,9 +444,9 @@
log.info("classify:-------------->閾炬帴鍚嶇О:"+nodeLinkName);
log.info("classify:-------------->閾炬帴鐗堟湰:"+version);
if (dockingPreClassify == null || StringUtils.isBlank(dockingPreClassify.getOid())) {
- 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);
@@ -582,9 +587,9 @@
*/
private boolean saveDatas(DockingQueryClassModelVO dockingQueryClassifyModelVO) throws Throwable {
try {
- DockingClassifyMainVO mainData = dockingQueryClassifyModelVO.getMainData();
- List<DockingClassifyVO> classList = mainData.getClassList();
- Map<String,List<DockingClassifyViewVO>>classInfoMap = mainData.getClassInfos();
+ DockingClassifyMainVO data = dockingQueryClassifyModelVO.getData();
+ List<DockingClassifyVO> classList = data.getClassList();
+ Map<String,List<DockingClassifyViewVO>>classInfoMap = data.getClassInfos();
////initVCIInvocationInfo("1");
List<DockingPreClassify> dockingPreClassifyArrayList=new ArrayList<>();
for (DockingClassifyVO jclassObject : classList) {
@@ -603,9 +608,9 @@
log.info("classify:-------------->閾炬帴鍚嶇О:"+nodeLinkName);
if (dockingPreClassify == null || StringUtils.isBlank(dockingPreClassify.getOid())) {
- 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);
@@ -643,14 +648,14 @@
Map<String, DockingPreViewModel> jviewmodelMap = new HashMap<String, DockingPreViewModel>();
//Map<String, String> condtionMa = new HashMap<String, String>();
// condtionMa.put("jsourceclsfid", jclassId);
- List<DockingPreViewModel> dockingPreViewModelList= dockingPreViewModelService.list(Wrappers.<DockingPreViewModel>query().lambda().eq(DockingPreViewModel::getSourceClassifyId,false));// 鏍规嵁鍒嗙被鏌ヨ妯″瀷瑙嗗浘瀵硅薄
+ List<DockingPreViewModel> dockingPreViewModelList= dockingPreViewModelService.list(Wrappers.<DockingPreViewModel>query().lambda().eq(DockingPreViewModel::getSourceClassifyId,jclassId));// 鏍规嵁鍒嗙被鏌ヨ妯″瀷瑙嗗浘瀵硅薄
for (DockingPreViewModel dockingPreViewModel : dockingPreViewModelList) {
jviewmodelMap.put(dockingPreViewModel.getViewName(),dockingPreViewModel);
}
for (DockingClassifyViewVO viewInfo : list) {
String viewName = com.alibaba.cloud.commons.lang.StringUtils.isBlank(viewInfo.getViewName())?"":viewInfo.getViewName();
- String impactList = com.alibaba.cloud.commons.lang.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);
@@ -660,10 +665,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);// 闆嗗洟瑙嗗浘鍚嶇О
//褰卞搷缂栫爜椤圭殑鏁版嵁
@@ -718,9 +723,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);// 灞炴�у悕绉�
@@ -743,6 +748,8 @@
List<DockingClassifyMetaAttrVO> childMetaList = new ArrayList<>();
childMetaList.add(compositeMeta);
getMetaAttrObject(childMetaList, jclassId,jviewModelObject, pid,allDockingPreMetaAttrList);
+ }else{
+ allDockingPreMetaAttrList.add(dockingPreMetaAttr);
}
}
@@ -782,9 +789,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