From 9c7de90e010371d47da6c4e7de7cbf1c8c476372 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 22 八月 2024 17:49:51 +0800
Subject: [PATCH] 首页系统配置接口测试修改，菜单查询相关修改：PLMODULENO字段因平台已停用，所有将对象中的moduleNo删除。
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java | 58 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 43 insertions(+), 15 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java
index 1f6c4de..8cde4ca 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.JSONReader;
import com.vci.client.ClientSession;
import com.vci.common.exception.VciException;
import com.vci.common.locale.LocaleDisplay;
@@ -176,7 +177,7 @@
private SmFunctionVO functionForPlatform1ToFunctionVO(SmFunctionForPlatform1 functionForPlatform1){
SmFunctionVO functionVO = new SmFunctionVO();
functionVO.setOid(functionForPlatform1.getPloid());
- functionVO.setId(String.valueOf(functionForPlatform1.getPlmoduleno()));
+ //functionVO.setId(String.valueOf(functionForPlatform1.getPlmoduleno()));
functionVO.setName(functionForPlatform1.getPlname());
functionVO.setLogName(functionForPlatform1.getPlaliasname());
if(StringUtils.isNotBlank(functionForPlatform1.getPlresourceb())){
@@ -287,8 +288,10 @@
//濡傛灉鏄紑鍙戞垨鑰呮祴璇曠敤鎴凤紝闇�鍝熻幏鍙栫郴缁熸ā鍧楅厤缃彍鍗�
if(adminOrDeveloperOrRoot){
//鑾峰彇棣栭〉绯荤粺妯″潡閰嶇疆鑿滃崟
- MenuVO menuVO = JsonConfigReader.getMenuVO();
- functionVOList.add(menuVO);
+ MenuVO menuVO = JsonConfigReader.getSysModuleConf().getSysModuleNode();
+ if(Func.isNotEmpty(menuVO)){
+ functionVOList.add(menuVO);
+ }
}
return functionVOList.stream().sorted(Comparator.comparing(s -> s.getSort())).collect(Collectors.toList());
}
@@ -296,27 +299,30 @@
/**
* 閫氳繃妯″潡ID鑾峰彇瀛愮骇鍒楄〃
* @param parentId
+ * @param modeType 妯″潡绫诲瀷
* @param isAll 鏄惁鍖呮嫭鏃犳晥鐨勬ā鍧楋紝true鍒欏寘鎷�
* @return
* @throws VciBaseException
*/
@Override
- public List<MenuVO> getSysModelTreeMenuByPID(String parentId,boolean isAll) throws VciBaseException{
+ public List<MenuVO> getSysModelTreeMenuByPID(String parentId,String modeType,boolean isAll) throws VciBaseException{
List<MenuVO> menuVOList = new ArrayList<>();
if(Func.isBlank(parentId)){
return menuVOList;
}
- if(parentId.equals("mangeModel") || parentId.equals("businessModel")){
- if(parentId.equalsIgnoreCase("FunctionObject")){
+ boolean isFunctionObject = Func.isNotBlank(modeType) && modeType.equalsIgnoreCase("FunctionObject");
+ if(parentId.equals("systemManagmentNode") || parentId.equals("modelManagmentNode") || isFunctionObject){
+ int childType = this.checkChildObject(parentId);
+ if(isFunctionObject){
try {
/**鍒ゆ柇璇ユā鍧椾笅瀛愬璞℃槸妯″潡杩樻槸鎿嶄綔锛�0琛ㄧず鏃犲瓙鑺傜偣锛�1琛ㄧず鏄ā鍧楋紝2琛ㄧず鏄搷浣�**/
- int childType = this.checkChildObject(parentId);
if(childType == 2){
try{
FuncOperationInfo[] infos = platformClientUtil.getFrameworkService().getFuncOperationByModule(parentId, "", false);
for(int i = 0;i < infos.length ;i++){
FuncOperationInfo info = infos[i];
MenuVO menuVO = new MenuVO();
+ menuVO.setChildType(childType);
menuVO.setId(info.id);
menuVO.setCode(info.funcId);
menuVO.setId(info.operId);
@@ -325,7 +331,8 @@
menuVO.setAlias(info.operAlias);
menuVO.setRemark(info.operDesc);
menuVO.setSort((int) info.number);
- //menuVO.setIsValid(info.isValid);
+ menuVO.setModeType("FunctionObject");
+ menuVO.setIsValid(info.isValid);
menuVO.setHasChildren(false);
menuVOList.add(menuVO);
}
@@ -339,6 +346,8 @@
for(int i = 0;i < funcInfos.length; i++){
FunctionInfo funcInfo = funcInfos[i];
MenuVO menuVO = this.functionInfoToMenuVO(funcInfo);
+ menuVO.setChildType(childType);
+ menuVO.setModeType("FunctionObject");
menuVOList.add(menuVO);
}
}catch (PLException e) {
@@ -352,21 +361,36 @@
}
}else{
try{
+ MenuVO parentNode;
+ //灏嗚繑鍥炵殑鑺傜偣澶栧眰濂椾笂褰撳墠鐖惰妭鐐�
+ if(parentId.equals("systemManagmentNode")){
+ parentNode = JsonConfigReader.getSysModuleConf().getSystemManagmentNode();
+ }else{
+ parentNode = JsonConfigReader.getSysModuleConf().getModelManagmentNode();
+ }
+ List<MenuVO> menuVOS = new ArrayList<>();
+ //鏌ヨ鐨勪笁绾ц妭鐐�
FunctionInfo[] funcInfos = platformClientUtil.getFrameworkService().getModuleListByParentId(parentId, isAll);
for(int i = 0;i < funcInfos.length; i++){
FunctionInfo funcInfo = funcInfos[i];
MenuVO menuVO = this.functionInfoToMenuVO(funcInfo);
menuVO.setModeType("FunctionObject");
- menuVOList.add(menuVO);
+ menuVO.setChildType(childType);
+ menuVOS.add(menuVO);
}
+ parentNode.setChildren(menuVOS);
+ menuVOList.add(parentNode);
}catch (PLException e) {
e.printStackTrace();
throw new VciBaseException(String.valueOf(e.code),e.messages);
}
}
- }else if(parentId.equals("operateType")){
+ }else if(parentId.equals("sysOptionNode")){
//鍔犺浇鎵�鏈夋搷浣�
try{
+ //灏嗚繑鍥炵殑鑺傜偣澶栧眰濂椾笂褰撳墠鐖惰妭鐐�
+ MenuVO parentNode = JsonConfigReader.getSysModuleConf().getOperateNode();
+ List<MenuVO> menuVOS = new ArrayList<>();
OperateInfo[] operateInfos = platformClientUtil.getFrameworkService().getOperateTreeList(parentId);
for(int i = 0; i < operateInfos.length;i++ ){
OperateInfo operateInfo = operateInfos[i];
@@ -376,19 +400,22 @@
menuVO.setCode(operateInfo.identify);
menuVO.setAlias(operateInfo.alias);
menuVO.setCategory(2);
+ menuVO.setChildType(0);
menuVO.setRemark(operateInfo.desc);
menuVO.getMeta().put("keepAlive",false);
menuVO.setSort((int) operateInfo.seq);
menuVO.setModeType("operateObject");
menuVO.setHasChildren(false);
- menuVOList.add(menuVO);
+ menuVOS.add(menuVO);
}
+ parentNode.setChildren(menuVOS);
+ menuVOList.add(parentNode);
}catch (PLException e) {
e.printStackTrace();
throw new VciBaseException(String.valueOf(e.code),new String[]{VciBaseUtil.getExceptionMessage(e)});
}
}
- return menuVOList;
+ return menuVOList.stream().sorted(Comparator.comparing(s -> s.getSort())).collect(Collectors.toList());
}
/**
@@ -399,10 +426,11 @@
private MenuVO functionInfoToMenuVO(FunctionInfo funcInfo){
MenuVO menuVO = new MenuVO();
menuVO.setId(funcInfo.id);
+ menuVO.setValid(funcInfo.isValid);
menuVO.setSource(funcInfo.image);
- //if(StringUtils.isBlank(menu.resourceB)){
- // continue;
- //}
+ menuVO.setPathC(funcInfo.resourceC);
+ menuVO.setResourceDotNet(funcInfo.resourceDotNet);
+ menuVO.setResourceMobile(funcInfo.resourceMobile);
menuVO.setPath(funcInfo.resourceB);
menuVO.setParentId(funcInfo.parentId);
menuVO.setCode(funcInfo.aliasName);
--
Gitblit v1.9.3