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/service/impl/GroupMdmInterServiceImpl.java | 196 +++++++++++++++++++++++++++++++++---------------
1 files changed, 135 insertions(+), 61 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 b0535f1..c22e677 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
@@ -1,5 +1,6 @@
package com.vci.ubcs.code.applyjtcodeservice.service.impl;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -10,6 +11,8 @@
import com.vci.ubcs.code.applyjtcodeservice.service.IGroupMdmInterService;
import com.vci.ubcs.code.applyjtcodeservice.vo.*;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
+import com.vci.ubcs.code.vo.webserviceModel.apply.ApplyDataVO;
+import com.vci.ubcs.code.vo.webserviceModel.apply.InterParameterVO;
import com.vci.ubcs.code.vo.webserviceModel.result.xml.XMLResultDataObjectDetailDO;
import com.vci.ubcs.starter.util.MdmBtmTypeConstant;
import com.vci.ubcs.code.applyjtcodeservice.feign.MdmApplyGroupCodeProvider;
@@ -19,8 +22,10 @@
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.map.CaseInsensitiveMap;
import org.springblade.core.secure.utils.AuthUtil;
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.stereotype.Service;
@@ -43,11 +48,14 @@
private String code="";
private String msg="";
- @Value("${docking.apply.partCoe:10}")
+
+ @Value("${docking.apply.partCode:101}")
public String partCoe;
- @Value("${docking.apply.userFlag:false}")
+
+ @Value("${docking.apply.usedFlag:false}")
public boolean usedFlag;
- @Value("${docking.apply.unitCode:41000}")
+
+ @Value("${docking.apply.unitCode:4100}")
public String dockingApplyUnitCode;
@Value("${docking.apply.sysName:410-MDM}")
@@ -55,6 +63,7 @@
@Autowired(required = false)
private MdmApplyGroupCodeProvider mdmApplyGroupCodeProvider;
+
/***
* 闆嗗洟鍒嗙被鏈嶅姟
*/
@@ -67,13 +76,11 @@
@Autowired(required = false)
private com.vci.ubcs.code.applyjtcodeservice.service.IDockingPreApplyFormService dockingPreApplyFormService;
-
/***
* 妯″瀷瑙嗗浘鍗曟湇鍔�
*/
@Autowired(required = false)
private com.vci.ubcs.code.applyjtcodeservice.service.IDockingPreViewModelService dockingPreViewModelService;
-
/***
* 闆嗗洟鍒嗙被灞炴�у睘鎬ф槧灏勯厤缃湇鍔�
@@ -86,7 +93,6 @@
@Autowired(required = false)
private com.vci.ubcs.code.applyjtcodeservice.service.IDockingPreAttrRangeService dockingPreAttrRangeService;
-
/***
* 闆嗗洟灞炴�ф湇鍔�
*/
@@ -95,8 +101,9 @@
@Autowired(required = false)
private IMdmEngineClient mdmEngineClient;
+
/***
- * 涓绘暟鎹儚闆嗗洟鐢宠缂栫爜
+ * 涓绘暟鎹悜闆嗗洟鐢宠缂栫爜
* @param oids 闇�瑕佺敵璇风殑鏁版嵁涓婚敭鏁扮粍
* @param btmName 涓氬姟绫诲瀷
* @return 杩斿洖缁撴灉淇℃伅
@@ -119,18 +126,33 @@
Map<String, DockingPreApplyForm> addDockingPreApplyFormMap = new HashMap<String, DockingPreApplyForm>();
Map<String, DockingPreApplyForm> editDockingPreApplyFormMap = new HashMap<String, DockingPreApplyForm>();
Map<String, BaseModel> baseModelMap = new HashMap<String, BaseModel>();
+ //鏁版嵁搴撲笉瀛樺湪鐨�
+ /*List<BaseModel> newDdataModelList = dataModelList.stream().filter(cbo -> {
+ String groupcode =cbo.getData().getOrDefault("GROUPCODE","");
+ return StringUtils.isBlank(groupcode);
+ }).collect(Collectors.toList());
+ if(newDdataModelList.size()==0)
+ return R.fail("鐢宠鎺ュ彛璋冪敤鎴愬姛,鎵�鏈夋暟鎹凡缁忓瓨鍦ㄩ泦鍥㈢爜");*/
+
//缁勭粐鏁版嵁
dockingGroupDataVO = queryApplycodeDataObjects(1, dataModelList, addDockingPreApplyFormMap, editDockingPreApplyFormMap, baseModelMap);
- DockingResultVO resultDataObject = mdmApplyGroupCodeProvider.receiveAddApply(dockingGroupDataVO);
+ Object object = JSONObject.toJSON(dockingGroupDataVO);
+ String resultStr = object.toString();
+ log.info("鐢宠闆嗗洟鐮佹暟鎹牸寮�:->"+resultStr);
+ DockingResultVO resultDataObject = new DockingResultVO();
+ resultDataObject = mdmApplyGroupCodeProvider.receiveAddApply(dockingGroupDataVO);
code = resultDataObject.getCode();
msg = resultDataObject.getMsg();
+ boolean res=false;
if ("1".equals(resultDataObject.getCode())) {//缁撴灉姝ｇ‘鐨勬儏鍐�
List<DockingDataVO> dataObjectVOList = resultDataObject.getData();
+ res=true;
dataObjectVOList.stream().forEach(dataObject -> {
boolean isEditDatas = false;
String code2 = dataObject.getCode();
DockingMainDataVO data2 = dataObject.getData();
String applyId = data2.getApplyId();//鐢宠鍗昳d
+ BaseModel baseModel = baseModelMap.get(applyId);
String customCoding = StringUtils.isBlank(data2.getCustomCoding()) ? "" : data2.getCustomCoding();//闆嗗洟鐮佹
msg = dataObject.getMsg();
if (code2.equals("1")) {//缁撴灉姝ｇ‘鐨勬儏鍐�
@@ -142,8 +164,16 @@
if (editDockingPreApplyFormMap.containsKey(applyId)) {
DockingPreApplyForm dockingPreApplyForm = editDockingPreApplyFormMap.get(applyId);
dockingPreApplyForm.setCode(code2);
+ //dockingPreApplyForm.setDescription(baseModel.getId());
dockingPreApplyForm.setMsg("鐢宠锛�" + msg);
- dockingPreApplyForm.setGroupCode(customCoding);
+ if(StringUtils.isBlank(dockingPreApplyForm.getGroupCode())) {
+ dockingPreApplyForm.setGroupCode(customCoding);
+ }else{
+ isEditDatas = true;
+ if (StringUtils.isBlank(customCoding)) {
+ customCoding=dockingPreApplyForm.getGroupCode();
+ }
+ }
ObjectMapper mp = new ObjectMapper();
String writeValueAsString = null;
try {
@@ -151,11 +181,13 @@
dockingPreApplyForm.setContent(writeValueAsString);
} catch (JsonProcessingException e) {
}
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm);
}
//鏂板鐨勭敵璇峰崟鏁版嵁
if (addDockingPreApplyFormMap.containsKey(applyId)) {
DockingPreApplyForm dockingPreApplyForm = addDockingPreApplyFormMap.get(applyId);
dockingPreApplyForm.setCode(code2);
+ dockingPreApplyForm.setDescription(baseModel.getId());
dockingPreApplyForm.setMsg("鐢宠锛�" + msg);
dockingPreApplyForm.setGroupCode(customCoding);
ObjectMapper mp = new ObjectMapper();
@@ -165,25 +197,28 @@
dockingPreApplyForm.setContent(writeValueAsString);
} catch (JsonProcessingException e) {
}
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
}
//濡傛灉鏈夐泦鍥㈢爜鍒欐洿鏂版暟鎹�
if (isEditDatas) {
if (baseModelMap.containsKey(applyId)) {
- BaseModel baseModel = baseModelMap.get(applyId);
- String classOid=baseModel.getData().getOrDefault("CODECLSFID","");
+ baseModel = baseModelMap.get(applyId);
+ Map<String,String> dataValueMap=new CaseInsensitiveMap<>(baseModel.getData());
+ /*String classOid=baseModel.getId();
if(partCoe.equals(classOid)){
baseModel.setId(10+customCoding);
- }
+ customCoding=10+customCoding;
+ }*/
BeanUtilForVCI.copyDeclaredIgnoreCase(baseModel, baseModel);
DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
-
- baseModel.getData().getOrDefault("groupCode", customCoding);
+ // DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
+ baseModel.getData().put("GROUPCODE",customCoding);
updateCbos.add(baseModel);//鏇存柊鏁版嵁闆嗗洟code
}
}
});
} else {
+ res=false;
editDockingPreApplyFormMap.forEach((key, dockingPreApplyForm) -> {
dockingPreApplyForm.setCode("2");
dockingPreApplyForm.setMsg("鐢宠锛�" + msg);
@@ -208,6 +243,9 @@
//淇濆瓨琛ㄥ崟鏁版嵁
dockingPreApplyFormService.saveOrUpdateBatch(dockingPreAttrMappings);
mdmEngineClient.updateBatchBtypeDatas(btmName, updateCbos);//淇濆瓨鏁版嵁
+ if(!res){
+ throw new VciBaseException(msg);
+ }
}
return R.success("鐢宠鎺ュ彛璋冪敤鎴愬姛");
} catch (VciBaseException e) {
@@ -217,6 +255,7 @@
return R.fail("鐢宠鎺ュ彛寮�鍏冲凡鍏抽棴锛屼笉鐢宠闆嗗洟鐮�");
}
}
+
/***
* 涓绘暟鎹儚闆嗗洟鏇存敼缂栫爜
* @param oids 闇�瑕佷慨鏀圭殑鏁版嵁涓婚敭鏁扮粍
@@ -227,7 +266,7 @@
@Transactional(rollbackFor = VciBaseException.class)
@Override
public R receiveEditApply(String oids, String btmName) throws VciBaseException {
- if(usedFlag) {
+ if(!usedFlag) {
log.info("鏇存柊鎺ュ彛鍔熻兘宸插叧闂紒->"+usedFlag);
R.success("鏇存柊鎺ュ彛鍔熻兘宸插叧闂紒");
}
@@ -238,6 +277,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();
//鐢宠鍗曞拰鐢宠鍗曞璞″叧绯�
@@ -268,7 +312,9 @@
DockingPreApplyForm dockingPreApplyForm = editDockingPreApplyFormMap.get(applyId);
dockingPreApplyForm.setCode(code2);
dockingPreApplyForm.setMsg("淇敼锛�" + msg);
- dockingPreApplyForm.setGroupCode(customCoding);
+ if(StringUtils.isBlank(dockingPreApplyForm.getGroupCode())) {
+ dockingPreApplyForm.setGroupCode(customCoding);
+ }
ObjectMapper mp = new ObjectMapper();
String writeValueAsString = null;
try {
@@ -276,13 +322,16 @@
dockingPreApplyForm.setContent(writeValueAsString);
} catch (JsonProcessingException e) {
}
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm);
}
//鏂板鐨勭敵璇峰崟鏁版嵁
if (addDockingPreApplyFormMap.containsKey(applyId)) {
DockingPreApplyForm dockingPreApplyForm = addDockingPreApplyFormMap.get(applyId);
dockingPreApplyForm.setCode(code2);
dockingPreApplyForm.setMsg("淇敼锛�" + msg);
- dockingPreApplyForm.setGroupCode(customCoding);
+ if(StringUtils.isBlank(dockingPreApplyForm.getGroupCode())) {
+ dockingPreApplyForm.setGroupCode(customCoding);
+ }
ObjectMapper mp = new ObjectMapper();
String writeValueAsString = null;
try {
@@ -290,19 +339,20 @@
dockingPreApplyForm.setContent(writeValueAsString);
} catch (JsonProcessingException e) {
}
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
}
//濡傛灉鏈夐泦鍥㈢爜鍒欐洿鏂版暟鎹�
if (isEditDatas) {
if (baseModelMap.containsKey(applyId)) {
BaseModel baseModel = baseModelMap.get(applyId);
//BeanUtilForVCI.copyDeclaredIgnoreCase(baseModelVO, baseModel);
- String classOid=baseModel.getData().getOrDefault("CODECLSFID","");
+ /*String classOid=baseModel.getData().getOrDefault("CODECLSFID","");
if(partCoe.equals(classOid)){
baseModel.setId(10+customCoding);
- }
+ }*/
DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
// baseModel.setId(customCoding);
- baseModel.getData().put("groupCode", customCoding);
+ baseModel.getData().put("GROUPCODE", customCoding);
updateCbos.add(baseModel);//鏇存柊鏁版嵁闆嗗洟code
}
}
@@ -349,7 +399,7 @@
public R queryClassModel(String groupClassifyId) throws Throwable {
log.info("鑾峰彇闆嗗洟妯″瀷璇︾粏淇℃伅鎵ц淇濆瓨start");
String message="鎵ц鎴愬姛锛�";
- if(usedFlag){
+ if(!usedFlag){
log.info("鑾峰彇闆嗗洟妯″瀷璇︾粏淇℃伅鎵ц淇濆瓨鍔熻兘宸插叧闂紒->"+usedFlag);
return R.fail("鑾峰彇闆嗗洟妯″瀷璇︾粏淇℃伅鎺ュ彛宸插叧闂�!");
}
@@ -401,7 +451,7 @@
public R queryMdmModel() throws Throwable {
String message="鎵ц鎴愬姛锛�";
log.info("浠庨泦鍥㈣幏鍙栦富妯″瀷淇℃伅鎵ц淇濆瓨鎺ュ彛statr");
- if(usedFlag){
+ if(!usedFlag){
log.info("浠庨泦鍥㈣幏鍙栦富妯″瀷淇℃伅鎵ц淇濆瓨鎺ュ彛鍔熻兘宸插叧闂紒->"+usedFlag);
return R.fail("鏌ヨ妯″瀷瑙嗗浘鎺ュ彛宸插叧闂�!");
}
@@ -471,15 +521,13 @@
}
return R.success(message);
}catch (Throwable e){
- e.printStackTrace();;
+ e.printStackTrace();
log.error("鑾峰彇鏁版嵁妯″瀷澶辫触"+e);
R.fail(message);
}
log.info("浠庨泦鍥㈣幏鍙栦富妯″瀷淇℃伅鎵ц淇濆瓨鎺ュ彛end");
return R.success(message);
}
-
-
/***
* 鏌ヨ鐢宠鍗曠姸鎬�
@@ -488,12 +536,12 @@
*/
@Override
public R queryApplyState(String dataOids) throws VciBaseException {
- if(usedFlag){
+ if(!usedFlag){
log.info("鏌ヨ鐢宠鍗曠姸鎬佹帴鍙ｅ紑鍏冲凡鍏抽棴");
return R.fail("鏌ヨ鐢宠鍗曠姸鎬佹帴鍙ｅ紑鍏冲凡鍏抽棴");
}
String message="鎵ц鎴愬姛锛�";
- log.info("鏌ヨ鐢宠鍗曠姸鎬佹帴鍙tatr");
+ log.info("鏌ヨ鐢宠鍗曠姸鎬佹帴鍙tart");
try {
VciBaseUtil.alertNotNull(dataOids,"鎵�鏌ョ敵璇峰崟鏁版嵁涓婚敭");
VciBaseUtil.alertNotNull(dockingApplySysName,"绯荤粺鏍囪瘑閰嶇疆锛歞ocking.apply.unitCode");
@@ -508,13 +556,14 @@
DockingModelQueryVO dockingModelQueryVO=new DockingModelQueryVO();
dockingModelQueryVO.setApplyNums(VciBaseUtil.array2String(applyIdList.toArray(new String[]{})));
dockingModelQueryVO.setSysName(dockingApplySysName);
- DockingApplyFormQueryStatusVO dockingApplyFormQueryStatusVO=mdmApplyGroupCodeProvider.queryApplyState(dockingModelQueryVO);
+ DockingApplyFormQueryStatusVO dockingApplyFormQueryStatusVO = mdmApplyGroupCodeProvider.queryApplyState(dockingModelQueryVO);
int code=dockingApplyFormQueryStatusVO.getCode();
String mesg=dockingApplyFormQueryStatusVO.getMsg();
if(code==1){
+ message=mesg;
List<DockingApplyFormStatusVO> dockingApplyFormStatusVOList=dockingApplyFormQueryStatusVO.getData();
- if(CollectionUtils.isEmpty(dockingApplyFormStatusVOList)){
+ if(!CollectionUtils.isEmpty(dockingApplyFormStatusVOList)){
for (DockingApplyFormStatusVO applyFormDataState : dockingApplyFormStatusVOList) {
String applyId=applyFormDataState.getApplyNum();
String state= applyFormDataState.getFormState();
@@ -525,21 +574,24 @@
applyFormObject.setMsg(jmsg);
}
}
- boolean res=this.dockingPreApplyFormService.saveOrUpdateBatch(dockingPreApplyFormList);
- if(res){
- R.success("鐢宠闆嗗洟鐮佺姸鎬佹煡璇㈡垚鍔�:"+mesg);
- }
+ boolean res = this.dockingPreApplyFormService.saveOrUpdateBatch(dockingPreApplyFormList);
}else{
throw new Throwable("娌℃湁鑾峰彇鍒扮浉鍏虫暟鎹俊鎭�");
}
}else{
- throw new Throwable(mesg);
+ message=mesg;
+ dockingPreApplyFormList.stream().forEach(dockingPreApplyForm -> {
+ dockingPreApplyForm.setMsg("鐢宠鍗曟煡鐪嬪け璐ワ細"+mesg);
+ });
+ this.dockingPreApplyFormService.saveOrUpdateBatch(dockingPreApplyFormList);
+ throw new Throwable(message);
}
}catch (Throwable e){
- e.printStackTrace();;
+ e.printStackTrace();
+ //message=""+e;
log.error("鑾峰彇鐢宠鍗曠姸鎬佸け璐�"+e);
- throw new VciBaseException(message);
+ throw new VciBaseException(e.getMessage());
}
log.info("鏌ヨ鐢宠鍗曠姸鎬佹帴鍙nd");
return R.success(message);
@@ -554,7 +606,7 @@
*/
@Override
public R syncClassifyModel(String classifyId, String operationType) throws VciBaseException {
- if(usedFlag){
+ if(!usedFlag){
log.info("鍚屾闆嗗洟妯″瀷淇℃伅寮�鍏冲凡鍏抽棴");
return R.fail("鍚屾闆嗗洟妯″瀷淇℃伅寮�鍏冲凡鍏抽棴");
}
@@ -582,9 +634,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,6 +655,7 @@
log.info("classify:-------------->閾炬帴鍚嶇О:"+nodeLinkName);
if (dockingPreClassify == null || StringUtils.isBlank(dockingPreClassify.getOid())) {
+ dockingPreClassify=new DockingPreClassify();
DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreClassify,MdmBtmTypeConstant.DOCKING_PRE_JCLASSIFY);
} else {
DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreClassify);
@@ -643,14 +696,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)==null||viewInfo.getImpactList().get(0).size()==0?"":viewInfo.getImpactList().get(0).get(0);
log.info("VilewMode:-------------->瑙嗗浘鍚嶇О:"+viewName);
log.info("VilewMode:-------------->褰卞搷缂栫爜椤�:"+impactList);
log.info("VilewMode:--------------> 闆嗗洟鍒嗙被涓婚敭:"+jclassId);
@@ -685,7 +738,6 @@
}
}
-
/***
* 鑾峰彇妯″瀷瑙嗗浘灞炴��
* @throws Throwable
@@ -698,7 +750,7 @@
.eq(DockingPreMetaAttr::getSourceClassifyId,jclassId).eq(DockingPreMetaAttr::getViewModelId,jviewModelObject.getOid())
.eq(DockingPreMetaAttr:: getPid,pid));
Map<String,DockingPreMetaAttr> jmetaattrMap = dockingPreMetaAttrList.stream().filter(
- s -> com.alibaba.cloud.commons.lang.StringUtils.isNotBlank(s.getEnglishName())).collect(Collectors.toMap(s -> s.getEnglishName().toLowerCase(Locale.ROOT), t -> t));
+ s -> com.alibaba.cloud.commons.lang.StringUtils.isNotBlank(s.getEnglishName())).collect(Collectors.toMap(s -> s.getEnglishName(), t -> t));
for (DockingClassifyMetaAttrVO dockingClassifyMetaAttrVO : metaList) {
String chineseName = com.alibaba.cloud.commons.lang.StringUtils.isBlank(dockingClassifyMetaAttrVO.getChineseName())?"":dockingClassifyMetaAttrVO.getChineseName();// 灞炴�у悕绉�
@@ -743,6 +795,8 @@
List<DockingClassifyMetaAttrVO> childMetaList = new ArrayList<>();
childMetaList.add(compositeMeta);
getMetaAttrObject(childMetaList, jclassId,jviewModelObject, pid,allDockingPreMetaAttrList);
+ }else{
+ allDockingPreMetaAttrList.add(dockingPreMetaAttr);
}
}
@@ -765,6 +819,7 @@
*/
private void getRange(DockingPreMetaAttr metaAttrObject,Map<String, String> range) throws Throwable {
String metaAttrOid = com.alibaba.cloud.commons.lang.StringUtils.isBlank(metaAttrObject.getOid())?"":metaAttrObject.getOid();// 灞炴�х殑oid
+
String jchinesename = com.alibaba.cloud.commons.lang.StringUtils.isBlank(metaAttrObject.getChineseName())?"":metaAttrObject.getChineseName();
Map<String, DockingPreAttrRange> rangeMap = new HashMap<>();
try {
@@ -772,7 +827,9 @@
condtionMa.put("jmetalistid", metaAttrOid);
List<DockingPreAttrRange> jmetaattrList = dockingPreAttrRangeService.selectByWrapper(Wrappers.<DockingPreAttrRange>query().lambda()
.eq(DockingPreAttrRange::getMetaListId,metaAttrOid));// 鏍规嵁鍒嗙被鏌ヨ妯″瀷瑙嗗浘瀵硅薄
- rangeMap= jmetaattrList.stream().collect(Collectors.toMap(s -> com.alibaba.cloud.commons.lang.StringUtils.isNotBlank(s.getNumText().toLowerCase(Locale.ROOT))?"":s.getNumText().toLowerCase(Locale.ROOT), t -> t));
+ log.info("鑾峰彇灞炴�х編鍓� 灞炴�d------->"+metaAttrOid);
+ //rangeMap= jmetaattrList.stream().collect(Collectors.toMap(s ->StringUtils.isNotBlank(s.getNumText())?"":s.getNumText(), t -> t));
+ rangeMap=jmetaattrList.stream().filter(data -> data != null && StringUtils.isNotBlank(data.getNumText())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getNumText(), t -> t));
for (String rangeKey : range.keySet()) {
DockingPreAttrRange rangeObject = new DockingPreAttrRange();
@@ -802,43 +859,42 @@
}
}
-
-
-
/**
* 缁勭粐鏁版嵁
* */
private DockingGroupDataVO queryApplycodeDataObjects(int optationtype,List<BaseModel> codeWupins,Map<String,DockingPreApplyForm> addDockingPreApplyFormMap,Map<String,DockingPreApplyForm> editDockingPreApplyFormMap,Map<String,BaseModel> codeWupinMap) throws VciBaseException{
try {
- String curUserName = AuthUtil.getUser().getUserName();
+ String curUserName =AuthUtil.getUser().getUserName();
//鐢宠鐨勬暟鎹�
List<DockingMainData> mainDataList=new ArrayList<DockingMainData>();
for (BaseModel dataBusinessObject : codeWupins) {
String format = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(new Date());
- String codeclsfid = dataBusinessObject.getData().getOrDefault("codeclsfid","");
+ //String codeclsfid = dataBusinessObject.getData().getOrDefault("codeclsfid".toUpperCase(Locale.ROOT),"");
+ Map<String,String> dataMap=new CaseInsensitiveMap<>(dataBusinessObject.getData());
+ String codeclsfid=dataMap.getOrDefault("codeclsfid","");
String btmName = dataBusinessObject.getBtmname();
String oid = dataBusinessObject.getOid();
-
DockingPreApplyForm dockingPreApplyForm = new DockingPreApplyForm();
String dataOid = dataBusinessObject.getOid();
Map<String, String> conditionsMap = new HashMap<String, String>();
- List<DockingPreApplyForm> applyFormObjects = dockingPreApplyFormService.list(Wrappers.<DockingPreApplyForm>query().lambda().eq(DockingPreApplyForm::getDataOid, dataOid).eq(DockingPreApplyForm::getOperationType, optationtype));
+ //List<DockingPreApplyForm> applyFormObjects = dockingPreApplyFormService.list(Wrappers.<DockingPreApplyForm>query().lambda().eq(DockingPreApplyForm::getDataOid, dataOid).eq(DockingPreApplyForm::getOperationType, optationtype));
+ // DockingPreApplyForm dockingPreApplyForm=new DockingPreApplyForm();
String apllyCode = "";
- if (!CollectionUtils.isEmpty(applyFormObjects)) {
+ /*if (!CollectionUtils.isEmpty(applyFormObjects)) {
dockingPreApplyForm = applyFormObjects.get(0);
apllyCode = dockingPreApplyForm.getId();
editDockingPreApplyFormMap.put(apllyCode, dockingPreApplyForm);//鐢宠鍗曞拰鐢宠鍗曞璞″叧绯�
- } else {
+ } else {*/
apllyCode = dockingApplyUnitCode + "-" + format;
dockingPreApplyForm.setId(apllyCode);
dockingPreApplyForm.setName("");
dockingPreApplyForm.setOperationType(optationtype+"");
- dockingPreApplyForm.setDescription(dataBusinessObject.getDescription());//鑾峰彇鏁版嵁鎻忚堪淇℃伅
+ dockingPreApplyForm.setDescription(dataBusinessObject.getId());//鑾峰彇鏁版嵁鎻忚堪淇℃伅
dockingPreApplyForm.setDataOid(oid);
dockingPreApplyForm.setDataBtmName(btmName);
addDockingPreApplyFormMap.put(apllyCode, dockingPreApplyForm);//鐢宠鍗曞拰鐢宠鍗曞璞″叧绯�
- }
+ // }
codeWupinMap.put(apllyCode, dataBusinessObject);//鐢宠鍗曞拰瀵瑰簲鏁版嵁鍏崇郴
conditionsMap = new HashMap<String, String>();
@@ -856,6 +912,11 @@
mainData.setApplyId(apllyCode);//鐢宠鍗曞彿
mainData.setClassName(dockingPreClassify.getNodeLinkName());//鍒嗙被鍚嶇О
mainData.setCreateBy(curUserName);//
+ if(optationtype==2) {
+ String groucode=dataBusinessObject.getData().getOrDefault("GROUPCODE","");
+ dockingPreApplyForm.setGroupCode(groucode);
+ mainData.setCustomCoding(groucode);
+ }
mainData.setSecretLevel("鍐呴儴");//瀵嗙骇锛岄粯璁や负鍐呴儴
mainData.setViewInfos(getviewInfos(optationtype,dockingPreClassify, dataBusinessObject));//鑾峰彇瑙嗗浘妯″瀷
mainDataList.add(mainData);
@@ -910,7 +971,7 @@
//鏋勯�犳ā鍨嬭鍥炬暟鎹�
List<Map<String, Object>> viewValueList=new ArrayList<Map<String,Object>>();
String oid = dockingPreViewModel.getOid();
- Map<String,String> dataValueMap=dataBusinessObject.getData();
+ Map<String,String> dataValueMap=new CaseInsensitiveMap<>(dataBusinessObject.getData());
String codeClassifyId=dataValueMap.get("codeclsfid");
Map<String,String>conditionsMap=new HashMap<String, String>();
List<DockingPreAttrMapping> dockingPreAttrMappingList = dockingPreAttrMappingMapper.selectList(Wrappers.<DockingPreAttrMapping>query().lambda()
@@ -937,7 +998,16 @@
Object newVaue=null;
if(StringUtils.isNotBlank(jtargetattrkey)){
getAttrRange(dockingPreMetaAttr);//鑾峰彇瀛楁鍙栧�艰寖鍥�
- String value=dataValueMap.get(jtargetattrkey)==null?"":dataValueMap.getOrDefault(jtargetattrkey,"");
+ String value="";
+ if(jtargetattrkey.toLowerCase(Locale.ROOT).equals("name")){
+ value=dataBusinessObject.getName();
+ }else if(jtargetattrkey.toLowerCase(Locale.ROOT).equals("id")){
+ value=dataBusinessObject.getId();
+ }else if(jtargetattrkey.toLowerCase(Locale.ROOT).equals("description")){
+ value=dataBusinessObject.getDescription();
+ }else{
+ value=dataValueMap.get(jtargetattrkey)==null?"":dataValueMap.getOrDefault(jtargetattrkey,"");
+ }
newVaue = getVaue(dockingPreMetaAttr, value);
}else{
newVaue = getVaue(dockingPreMetaAttr, "");
@@ -945,6 +1015,7 @@
if(newVaue==null||"".equals(newVaue)){
newVaue= dockingPreMetaAttr.getDefaultValue();
}
+ //newVaue= Func.isNotEmpty(newVaue)?newVaue:"";
viewValueMap.put(jenglishname, newVaue);
}
}
@@ -957,6 +1028,7 @@
* 鑾峰彇灞炴�ф灇涓炬槧灏勯厤缃�
*/
Map<String,Map<String, DockingPreAttrRange>> attrRangeMap=new HashMap<String, Map<String,DockingPreAttrRange>>();
+
private void getAttrRange(DockingPreMetaAttr jmetaatter) throws Throwable{
String jmetalistoid = jmetaatter.getOid();
@@ -974,6 +1046,7 @@
attrRangeMap.put(jmetalistoid, rangeMap);
}
+
/****
* 鍊肩被鍨嬭浆鎹�
* @param jmetaatter
@@ -1010,7 +1083,7 @@
return null;
}else {
try {
- return simpleDateFormat.parse(value);
+ return simpleDateFormat.format(simpleDateFormat.parse(value));
} catch (ParseException e) {
throw new VciBaseException("date", new String[]{"鏃ユ湡鏍煎紡杞崲閿欒"});
}
@@ -1021,7 +1094,7 @@
return null;
}else{
try {
- return simpleDateFormat.parse(value);
+ return simpleDateFormat.format(simpleDateFormat.parse(value));
} catch (ParseException e) {
throw new VciBaseException("date", new String[]{"鏃ユ湡鏍煎紡杞崲閿欒"});
}
@@ -1059,4 +1132,5 @@
}
return msg;
}
+
}
--
Gitblit v1.9.3