From 7377c6ab43dfc4b622055a992efaadc972c24726 Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期五, 03 一月 2025 17:18:58 +0800
Subject: [PATCH] 1、管理功能模块、业务功能模块,判断菜单标识alias是否唯一并且必须是英文。 2、操作类型模块添加图标数据。 3、ACTION增加图标。

---
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFunctionQueryServicePlatformImpl.java |   33 ++++++++++++++++++++-------------
 1 files changed, 20 insertions(+), 13 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..00490d5 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;
     }
@@ -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鑺傜偣
@@ -570,6 +575,7 @@
                     menuVO.setSort((int) operateInfo.seq);
                     menuVO.setModeType("operateObject");
                     menuVO.setHasChildren(false);
+                    menuVO.setSource(operateInfo.image);
                     menuVOList.add(menuVO);
                 }
             }catch (PLException e) {
@@ -708,13 +714,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