From 817206bae9cde6bf4f38387f07cd7a69e10fd8f5 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 19 十一月 2024 11:17:07 +0800
Subject: [PATCH] 系统模块配置增加functionType字段

---
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 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 b60237c..08ded69 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
@@ -340,6 +340,8 @@
                                     menuVO.setModeType("FunctionObject");
                                     menuVO.setIsValid(info.isValid);
                                     menuVO.setHasChildren(false);
+                                    menuVO.setCategory(1);
+                                    menuVO.setFunctionType(2);
                                     menuVOList.add(menuVO);
                                 }
                             }
@@ -357,6 +359,7 @@
                                     MenuVO menuVO = this.functionInfoToMenuVO(funcInfo);
                                     menuVO.setChildType(childType);
                                     menuVO.setModeType("FunctionObject");
+                                    menuVO.setCategory(0);
                                     menuVOList.add(menuVO);
                                 }
                             }
@@ -389,7 +392,9 @@
                         FunctionInfo funcInfo = funcInfos[i];
                         MenuVO menuVO = this.functionInfoToMenuVO(funcInfo);
                         menuVO.setModeType("FunctionObject");
+                        childType = this.checkChildObject(funcInfos[i].id);
                         menuVO.setChildType(childType);
+                        menuVO.setCategory(0);
                         menuVOList.add(menuVO);
                     }
                     return menuVOList;
@@ -416,7 +421,8 @@
                     menuVO.setName(operateInfo.name);
                     menuVO.setCode(operateInfo.identify);
                     menuVO.setAlias(operateInfo.alias);
-                    menuVO.setCategory(2);
+                    menuVO.setCategory(1);
+                    menuVO.setFunctionType(2);
                     menuVO.setChildType(0);
                     menuVO.setRemark(operateInfo.desc);
                     menuVO.getMeta().put("keepAlive",false);
@@ -438,11 +444,13 @@
      * @param funcInfo
      * @return
      */
-    private MenuVO functionInfoToMenuVO(FunctionInfo funcInfo){
+    private MenuVO functionInfoToMenuVO(FunctionInfo funcInfo)
+    {
         MenuVO menuVO = new MenuVO();
         menuVO.setId(funcInfo.id);
-        menuVO.setValid(funcInfo.isValid);
+        menuVO.setIsValid(funcInfo.isValid);
         menuVO.setSource(funcInfo.image);
+        menuVO.setFunctionType(funcInfo.functionType);
         menuVO.setPathC(funcInfo.resourceC);
         menuVO.setResourceDotNet(funcInfo.resourceDotNet);
         menuVO.setResourceMobile(funcInfo.resourceMobile);
@@ -470,7 +478,7 @@
     @Override
     public int checkChildObject(String moduleId) throws VciBaseException {
         long res = 0;
-        try{//20D63A69-C6BC-8519-8B2B-E5ACFEA62394
+        try{
             res = platformClientUtil.getFrameworkService().checkChildObject(moduleId);
         }catch (PLException e) {
             e.printStackTrace();
@@ -492,6 +500,7 @@
             MenuVO functionVO = new MenuVO();
             functionVO.setId(menu.id);
             functionVO.setSource(menu.image);
+            functionVO.setFunctionType(menu.functionType);
 //            if(StringUtils.isBlank(menu.resourceB) ){
 //                continue;
 //            }
@@ -599,7 +608,7 @@
         List<String> authList = new ArrayList<>();
         for (FunctionInfo functionInfo : moduleListByParentId) {
             if(authMap.containsKey(functionInfo.id)){
-                authList.add(functionInfo.id);
+//                authList.add(functionInfo.id);
                 getChildAuthNode(functionInfo, authMap, authList);
             }
         }
@@ -735,7 +744,7 @@
             FunctionInfo[] funcInfos = platformClientUtil.getFrameworkService().getModuleListByParentId(funcObj.id, false);
             for(int i=0;i<funcInfos.length;i++){
                 if(authMap.containsKey(funcInfos[i].id)){
-                    authList.add(funcInfos[i].id);
+//                    authList.add(funcInfos[i].id);
                     getChildAuthNode(funcInfos[i], authMap, authList);
                 }
             }

--
Gitblit v1.9.3