From bc44ef3c55007439a01bcbbdd3239f3e9cccb550 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期三, 19 七月 2023 18:13:02 +0800
Subject: [PATCH] 1、完成返回前端增加keepAlive字段用来标识页面是否缓存
---
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/GroupMdmInterServiceImpl.java | 95 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 76 insertions(+), 19 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/GroupMdmInterServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/GroupMdmInterServiceImpl.java
index b2ff550..0424584 100644
--- a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/GroupMdmInterServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/GroupMdmInterServiceImpl.java
@@ -7,11 +7,11 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.vci.ubcs.code.feign.IMdmEngineClient;
import com.vci.ubcs.code.webservice.entity.*;
+import com.vci.ubcs.code.webservice.service.IGroupMdmInterService;
import com.vci.ubcs.code.webservice.vo.*;
import com.vci.ubcs.starter.util.MdmBtmTypeConstant;
import com.vci.ubcs.code.webservice.feign.MdmApplyGroupCodeProvider;
import com.vci.ubcs.code.webservice.mapper.DockingPreAttrMappingMapper;
-import com.vci.ubcs.code.webservice.service.*;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
@@ -55,20 +55,20 @@
* 闆嗗洟鍒嗙被鏈嶅姟
*/
@Autowired(required = false)
- private IDockingPreClassifyService dockingPreClassifyService;
+ private com.vci.ubcs.code.webservice.service.IDockingPreClassifyService dockingPreClassifyService;
/***
* 鐢宠鍗曟湇鍔�
*/
@Autowired(required = false)
- private IDockingPreApplyFormService dockingPreApplyFormService;
+ private com.vci.ubcs.code.webservice.service.IDockingPreApplyFormService dockingPreApplyFormService;
/***
* 妯″瀷瑙嗗浘鍗曟湇鍔�
*/
@Autowired(required = false)
- private IDockingPreViewModelService dockingPreViewModelService;
+ private com.vci.ubcs.code.webservice.service.IDockingPreViewModelService dockingPreViewModelService;
/***
@@ -80,14 +80,14 @@
* 灞炴�у彇鍊艰寖鍥存湇鍔�
*/
@Autowired(required = false)
- private IDockingPreAttrRangeService dockingPreAttrRangeService;
+ private com.vci.ubcs.code.webservice.service.IDockingPreAttrRangeService dockingPreAttrRangeService;
/***
* 闆嗗洟灞炴�ф湇鍔�
*/
@Autowired(required = false)
- private IDockingPreMetaAttrService dockingPreMetaAttrService;
+ private com.vci.ubcs.code.webservice.service.IDockingPreMetaAttrService dockingPreMetaAttrService;
@Autowired(required = false)
private IMdmEngineClient mdmEngineClient;
@@ -198,7 +198,7 @@
}
//淇濆瓨琛ㄥ崟鏁版嵁
dockingPreApplyFormService.saveOrUpdateBatch(dockingPreAttrMappings);
- mdmEngineClient.insertBatchByType(btmName,updateCbos);//淇濆瓨鏁版嵁
+ mdmEngineClient.updateBatchByType(btmName,updateCbos);//淇濆瓨鏁版嵁
}
return R.success("鐢宠鎺ュ彛璋冪敤鎴愬姛");
}catch (VciBaseException e){
@@ -312,7 +312,7 @@
}
//淇濆瓨琛ㄥ崟鏁版嵁
dockingPreApplyFormService.saveOrUpdateBatch(dockingPreAttrMappings);
- mdmEngineClient.insertBatchByType(btmName,updateCbos);//淇濆瓨鏁版嵁
+ mdmEngineClient.updateBatchByType(btmName,updateCbos);//淇濆瓨鏁版嵁
}
return R.success("鐢宠鎺ュ彛璋冪敤鎴愬姛");
}catch (VciBaseException e){
@@ -355,7 +355,7 @@
throw new Throwable(message);
}
}else{
- message="鏈幏浠庨泦鍥㈣幏鍙栧埌浠讳綍妯″瀷淇℃伅";
+ message="鏈粠闆嗗洟鑾峰彇鍒颁换浣曟ā鍨嬩俊鎭�";
log.info(message);
throw new Throwable(message);
}
@@ -421,7 +421,7 @@
dockingPreClassify.setPid(pid);
dockingPreClassify.setId(classNumber);
dockingPreClassify.setNodeLink(nodeLink);
- dockingPreClassify.setGetNodeLinkName(nodeLinkName);
+ dockingPreClassify.setNodeLinkName(nodeLinkName);
dockingPreClassify.setClassName(className);
dockingPreClassify.setVersionValue(version);
dockingPreClassifyList.add(dockingPreClassify);
@@ -438,7 +438,7 @@
throw new Throwable(message);
}
}else{
- message="鏈幏浠庨泦鍥㈣幏鍙栧埌浠讳綍妯″瀷淇℃伅";
+ message="鏈粠闆嗗洟鑾峰彇鍒颁换浣曟ā鍨嬩俊鎭�";
log.info(message);
throw new Throwable(message);
}
@@ -459,24 +459,57 @@
* @param dataOids
* @return 鎵ц缁撴灉
*/
- public R queryApplyState(String dataOids) {
+ @Override
+ public R queryApplyState(String dataOids) throws VciBaseException {
String message="鎵ц鎴愬姛锛�";
log.info("鏌ヨ鐢宠鍗曠姸鎬佹帴鍙tatr");
try {
VciBaseUtil.alertNotNull(dataOids,"鎵�鏌ョ敵璇峰崟鏁版嵁涓婚敭");
VciBaseUtil.alertNotNull(dockingApplySysName,"绯荤粺鏍囪瘑閰嶇疆锛歞ocking.apply.unitCode");
-
+ List<String> applyIdList=new ArrayList<>();
List<DockingPreApplyForm> dockingPreApplyFormList= this.dockingPreApplyFormService.list(Wrappers.<DockingPreApplyForm>query().lambda().in(DockingPreApplyForm::getDataOid, VciBaseUtil.str2List(dataOids)));
+ Map<String,DockingPreApplyForm> dockingPreApplyFormMap=new HashMap<>();
dockingPreApplyFormList.stream().forEach(dockingPreApplyForm -> {
- dockingPreApplyForm.getId();
-
+ applyIdList.add(dockingPreApplyForm.getId());
+ dockingPreApplyFormMap.put(dockingPreApplyForm.getId(),dockingPreApplyForm);
});
+
+ DockingModelQueryVO dockingModelQueryVO=new DockingModelQueryVO();
+ dockingModelQueryVO.setApplyNums(VciBaseUtil.array2String(applyIdList.toArray(new String[]{})));
+ dockingModelQueryVO.setSysName(dockingApplySysName);
+ DockingApplyFormQueryStatusVO dockingApplyFormQueryStatusVO=mdmApplyGroupCodeProvider.queryApplyState(dockingModelQueryVO);
+
+ int code=dockingApplyFormQueryStatusVO.getCode();
+ String mesg=dockingApplyFormQueryStatusVO.getMsg();
+ if(code==1){
+ List<DockingApplyFormStatusVO> dockingApplyFormStatusVOList=dockingApplyFormQueryStatusVO.getData();
+ if(CollectionUtils.isEmpty(dockingApplyFormStatusVOList)){
+ for (DockingApplyFormStatusVO applyFormDataState : dockingApplyFormStatusVOList) {
+ String applyId=applyFormDataState.getApplyNum();
+ String state= applyFormDataState.getFormState();
+ String examineOpinion=applyFormDataState.getExamineOpinion();
+ String jmsg=getCodeState(state)+"锛屾剰瑙侊細"+examineOpinion;
+ if(dockingPreApplyFormMap.containsKey(applyId)){
+ DockingPreApplyForm applyFormObject=dockingPreApplyFormMap.get(applyId);
+ applyFormObject.setMsg(jmsg);
+ }
+ }
+ boolean res=this.dockingPreApplyFormService.saveOrUpdateBatch(dockingPreApplyFormList);
+ if(res){
+ R.success("鐢宠闆嗗洟鐮佺姸鎬佹煡璇㈡垚鍔�:"+mesg);
+ }
+ }else{
+ throw new Throwable("娌℃湁鑾峰彇鍒扮浉鍏虫暟鎹俊鎭�");
+ }
+ }else{
+ throw new Throwable(mesg);
+ }
}catch (Throwable e){
e.printStackTrace();;
- log.error("鑾峰彇鏁版嵁妯″瀷澶辫触"+e);
- R.fail(message);
+ log.error("鑾峰彇鐢宠鍗曠姸鎬佸け璐�"+e);
+ throw new VciBaseException(message);
}
log.info("鏌ヨ鐢宠鍗曠姸鎬佹帴鍙nd");
return R.success(message);
@@ -545,7 +578,7 @@
dockingPreClassify.setPid(pid);
dockingPreClassify.setId(classNumber);
dockingPreClassify.setNodeLink(nodeLink);
- dockingPreClassify.setGetNodeLinkName(nodeLinkName);
+ dockingPreClassify.setNodeLinkName(nodeLinkName);
dockingPreClassify.setClassName(className);
dockingPreClassifyArrayList.add(dockingPreClassify);
// 鑾峰彇瀵瑰簲鐨勫垎绫昏鍥炬ā鍨�
@@ -787,7 +820,7 @@
DockingMainData mainData = new DockingMainData();
mainData.setApplyEntId(dockingApplyUnitCode);//鐢宠鍗曚綅浠ｇ爜
mainData.setApplyId(apllyCode);//鐢宠鍗曞彿
- mainData.setClassName(dockingPreClassify.getGetNodeLinkName());//鍒嗙被鍚嶇О
+ mainData.setClassName(dockingPreClassify.getNodeLinkName());//鍒嗙被鍚嶇О
mainData.setCreateBy(curUserName);//
mainData.setSecretLevel("鍐呴儴");//瀵嗙骇锛岄粯璁や负鍐呴儴
mainData.setViewInfos(getviewInfos(optationtype,dockingPreClassify, dataBusinessObject));//鑾峰彇瑙嗗浘妯″瀷
@@ -968,4 +1001,28 @@
}
return value;
}
+
+ private String getCodeState(String formState){
+ String msg="";
+ if("1".equals(formState)){
+ msg="闆嗗洟瀹℃牳涓�";
+ }else if("2".equals(formState)){
+ msg="椹冲洖";
+ }else if("3".equals(formState)){
+ msg="闆嗗洟瀹℃牳涓�";
+ }else if("4".equals(formState)){
+ msg="瀹℃牳缁撴潫锛岃祴鐮佸け璐�";
+ }else if("5".equals(formState)){
+ msg="瀹℃牳缁撴潫锛岃祴鐮佹垚鍔�";
+ }else if("6".equals(formState)){
+ msg="寰�301璧嬬爜";
+ }else if("7".equals(formState)){
+ msg="宸茶祴鐮�";
+ }else if("8".equals(formState)){
+ msg="宸茶祴鐮侊紙娌跨敤锛�";
+ }else if("9".equals(formState)){
+ msg="瀹℃牳涓�";
+ }
+ return msg;
+ }
}
--
Gitblit v1.9.3