From 0d464e9757c7d590794a8d98911e2afe356db5ea Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期五, 03 一月 2025 10:47:16 +0800
Subject: [PATCH] 菜单和功能模块管理菜单节点不返回code别名
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFunctionQueryServicePlatformImpl.java | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFunctionQueryServicePlatformImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFunctionQueryServicePlatformImpl.java
index 9de09f6..1608adc 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFunctionQueryServicePlatformImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFunctionQueryServicePlatformImpl.java
@@ -13,6 +13,7 @@
import com.vci.model.SmRoleForPlatform1;
import com.vci.omd.utils.ObjectTool;
import com.vci.pagemodel.MenuVO;
+import com.vci.pagemodel.RoleRightVO;
import com.vci.pagemodel.SmFunctionVO;
import com.vci.pagemodel.UIContentVO;
import com.vci.starter.web.constant.QueryOptionConstant;
@@ -24,6 +25,7 @@
import com.vci.web.properties.JsonConfigReader;
import com.vci.web.service.ISmFunctionQueryService;
import com.vci.web.service.UIEngineServiceI;
+import com.vci.web.service.UIManagerServiceI;
import com.vci.web.service.WebBoServiceI;
import com.vci.starter.web.util.Lcm.Func;
import com.vci.web.util.PlatformClientUtil;
@@ -56,12 +58,12 @@
/**
* 鑿滃崟鐨勬牴鑺傜偣涓婚敭锛岃繖涓槸骞冲彴瀹氫箟鐨�
*/
- private final String ROOT_MENU_ID = "modelManagmentNode";
+ private final String ROOT_MENU_ID = "business";
/**
* 绠＄悊鍔熻兘妯″潡鑿滃崟鏍硅妭鐐�
*/
- private final String SYSTEMMANAGMENTNODE = "systemManagmentNode";
+ private final String SYSTEMMANAGMENTNODE = "system";
/**
* 鎿嶄綔绫诲瀷绠＄悊鑿滃崟鏍硅妭鐐�
@@ -87,13 +89,16 @@
private ISmFunctionQueryService self;
@Autowired
- private UIEngineServiceI uiEngineServiceI;
+ private UIEngineServiceI uiEngineServiceI;
+
+ @Autowired
+ private UIManagerServiceI uiManagerServiceI;
+
+ @Autowired
+ private RightControlUtil rightControlUtil;
@Autowired
private PlatformClientUtil platformClientUtil;
-
- @Autowired
- RightControlUtil rightControlUtil;
/**
* 鏌ヨ鎵�鏈夌殑鍔熻兘
@@ -363,7 +368,7 @@
}
}
- functionVO.setBtmname("function");
+ functionVO.setBtmName("function");
//鑰佺殑鏁版嵁閲屽垱寤轰汉锛屾渶鍚庝慨鏀逛汉绛夐兘娌℃湁
return functionVO;
}
@@ -410,7 +415,7 @@
//}
functionVO.setPath(menu.resourceB);
functionVO.setParentId(menu.parentId);
- functionVO.setCode(menu.aliasName);
+ //functionVO.setCode(menu.aliasName);
functionVO.setAlias(menu.aliasName);
functionVO.setName(menu.name);
functionVO.getMeta().put("keepAlive",false);
@@ -456,7 +461,7 @@
return menuVOList;
}
boolean isFunctionObject = Func.isNotBlank(modeType) && modeType.equalsIgnoreCase("FunctionObject");
- if(parentId.equals("systemManagmentNode") || parentId.equals("modelManagmentNode") || isFunctionObject){
+ if(parentId.equals("system") || parentId.equals("business") || isFunctionObject){
int childType = this.checkChildObject(parentId);
if(isFunctionObject){
try {
@@ -517,9 +522,9 @@
try{
MenuVO parentNode = null;
//灏嗚繑鍥炵殑鑺傜偣澶栧眰濂椾笂褰撳墠鐖惰妭鐐�
- if("systemManagmentNode".equals(parentId)){
+ if("system".equals(parentId)){
parentNode = JsonConfigReader.getSysModuleConf().getSystemManagmentNode();
- }else if("modelManagmentNode".equals(parentId)){
+ }else if("business".equals(parentId)){
parentNode = JsonConfigReader.getSysModuleConf().getModelManagmentNode();
}
//濡傛灉鏌ヨ鐨勬槸绗竴灞傝妭鐐瑰氨闇�瑕佺洿鎺ヨ繑鍥瀞ystemManagmentNode鎴杕odelManagmentNode鑺傜偣
@@ -596,7 +601,7 @@
menuVO.setResourceMobile(funcInfo.resourceMobile);
menuVO.setPath(funcInfo.resourceB);
menuVO.setParentId(funcInfo.parentId);
- menuVO.setCode(funcInfo.aliasName);
+ //menuVO.setCode(funcInfo.aliasName);
menuVO.setAlias(funcInfo.aliasName);
menuVO.setName(funcInfo.name);
menuVO.getMeta().put("keepAlive",false);
@@ -708,13 +713,14 @@
@Override
public UIContentVO getUIContentByBtmTypeAndId(TreeQueryObject treeQueryObject, ResourceControlTypeEnum resourceControlTypeEnum) throws PLException {
SessionInfo sessionInfo = WebUtil.getCurrentUserSessionInfoNotException();
- if(resourceControlTypeEnum == null){
+ /* if(resourceControlTypeEnum == null){
resourceControlTypeEnum = ResourceControlTypeEnum.BS;
- }
+ }*/
+ Map<String, RoleRightVO> roleRightMap = uiManagerServiceI.getRoleRightMap(null);
for (PLUILayout allPLUILayout : platformClientUtil.getUIService().getAllPLUILayouts()) {
if(treeQueryObject.getConditionMap().getOrDefault("type","").equals(allPLUILayout.plRelatedType)
&& treeQueryObject.getConditionMap().getOrDefault("context","").equals(allPLUILayout.plCode)){
- return uiEngineServiceI.UIContentDO2VO(allPLUILayout,true);
+ return uiEngineServiceI.UIContentDO2VO(allPLUILayout,true,roleRightMap);
}
}
return null;
--
Gitblit v1.9.3