From 986aa62ed00bee39363bab41b4eeb8259d446efd Mon Sep 17 00:00:00 2001 From: ludc <ludc@vci-tech.com> Date: 星期四, 16 一月 2025 18:20:32 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFunctionQueryServicePlatformImpl.java | 34 ++++++++++++++++++++-------------- 1 files changed, 20 insertions(+), 14 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 f241c1e..87d55b9 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 @@ -58,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"; /** * 鎿嶄綔绫诲瀷绠$悊鑿滃崟鏍硅妭鐐� @@ -297,6 +297,7 @@ menuVO.setHasChildren(false); menuVO.setCategory(1); menuVO.setFunctionType(2); + menuVO.setSource(info.image); buttonList.add(menuVO); } } @@ -415,10 +416,10 @@ //} 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); + functionVO.getMeta().put("keepAlive",true); functionVO.setSort((int) menu.seq); try { functionVO.setChildren(findChildFunctionVO(menu.id, map)); @@ -461,7 +462,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 { @@ -488,6 +489,7 @@ menuVO.setHasChildren(false); menuVO.setCategory(1); menuVO.setFunctionType(3); + menuVO.setSource(info.image); menuVOList.add(menuVO); } } @@ -522,9 +524,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鑺傜偣 @@ -571,10 +573,11 @@ menuVO.setFunctionType(2); menuVO.setChildType(0); menuVO.setRemark(operateInfo.desc); - menuVO.getMeta().put("keepAlive",false); + menuVO.getMeta().put("keepAlive",true); menuVO.setSort((int) operateInfo.seq); menuVO.setModeType("operateObject"); menuVO.setHasChildren(false); + menuVO.setSource(operateInfo.image); menuVOList.add(menuVO); } }catch (PLException e) { @@ -601,11 +604,12 @@ 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); + menuVO.getMeta().put("keepAlive",true); menuVO.setSort((int) funcInfo.seq); + menuVO.setRemark(funcInfo.desc); if(this.checkChildObject(menuVO.getId()) == 0){ menuVO.setHasChildren(false); }else{ @@ -648,12 +652,13 @@ functionVO.setFunctionType(menu.functionType); functionVO.setIsValid(menu.isValid); functionVO.setPath(menu.resourceB); - functionVO.setCode(menu.aliasName); + //functionVO.setCode(menu.aliasName); functionVO.setAlias(menu.aliasName); functionVO.setParentId(menu.parentId); functionVO.setName(menu.name); - functionVO.getMeta().put("keepAlive",false); + functionVO.getMeta().put("keepAlive",true); functionVO.setSort((int) menu.seq); + functionVO.setRemark(menu.desc); functionVO.setChildren(findChildFunctionVO(menu.id,map)); if(functionVO.getChildren().size() > 0){ functionVO.setHasChildren(true); @@ -680,8 +685,9 @@ menuVO.setParentId(funcObj.parentId); menuVO.setChildType((int) type); menuVO.setName(funcObj.name); - menuVO.getMeta().put("keepAlive",false); + menuVO.getMeta().put("keepAlive",true); menuVO.setSort((int) funcObj.seq); + menuVO.setRemark(funcObj.desc); findChildAuthFunctionVO(menuVO, isAll); functionVO.getChildren().add(menuVO); functionVO.setHasChildren(true); @@ -716,7 +722,7 @@ /* if(resourceControlTypeEnum == null){ resourceControlTypeEnum = ResourceControlTypeEnum.BS; }*/ - Map<String, RoleRightVO> roleRightMap = uiManagerServiceI.getRoleRightMap(null); + Map<String, List<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)){ -- Gitblit v1.9.3