From d336c430e5d22ade703ff12f3d523889eb3d75d6 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 08 十一月 2024 10:54:26 +0800
Subject: [PATCH] action管理 编辑 新增 分类禁用bug
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java | 513 ++++++++++++++++++++++++++------------------------------
1 files changed, 239 insertions(+), 274 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 7ee7870..38ac64a 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
@@ -8,11 +8,16 @@
import com.vci.common.exception.VciException;
import com.vci.common.locale.LocaleDisplay;
import com.vci.corba.common.PLException;
+import com.vci.corba.common.data.UserEntityInfo;
import com.vci.corba.framework.data.*;
import com.vci.corba.omd.data.BusinessObject;
import com.vci.corba.portal.data.PLUILayout;
+import com.vci.dto.RoleInfoDTO;
+import com.vci.dto.RoleRightDTO;
+import com.vci.dto.RoleRightParamDTO;
import com.vci.frameworkcore.compatibility.ISmFunctionQueryService;
import com.vci.frameworkcore.enumpck.ResourceControlTypeEnum;
+import com.vci.model.RoleRightDO;
import com.vci.model.SmFunctionForPlatform1;
import com.vci.model.SmRoleForPlatform1;
import com.vci.pagemodel.MenuVO;
@@ -258,7 +263,7 @@
}
MenuVO functionVO = new MenuVO();
functionVO.setId(menu.id);
- functionVO.setSource(menu.image);
+ functionVO.setSource(menu.icon);
//if(StringUtils.isBlank(menu.resourceB)){
// continue;
//}
@@ -433,11 +438,12 @@
* @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.setSource(funcInfo.image);
+ menuVO.setSource(funcInfo.icon);
menuVO.setPathC(funcInfo.resourceC);
menuVO.setResourceDotNet(funcInfo.resourceDotNet);
menuVO.setResourceMobile(funcInfo.resourceMobile);
@@ -486,7 +492,7 @@
}
MenuVO functionVO = new MenuVO();
functionVO.setId(menu.id);
- functionVO.setSource(menu.image);
+ functionVO.setSource(menu.icon);
// if(StringUtils.isBlank(menu.resourceB) ){
// continue;
// }
@@ -508,78 +514,49 @@
return functionVOList.stream().sorted(Comparator.comparing(s -> s.getSort())).collect(Collectors.toList());
}
- public List<MenuVO> findChildAuthFunctionVO(String parentId,MenuVO functionVO) throws PLException {
-// List<FunctionInfo> menus = map.get(parentOid);
+ public void findChildAuthFunctionVO(MenuVO functionVO, boolean isAll) throws PLException {
//0琛ㄧず娌℃湁妯″潡涔熸病鏈夋搷浣滐紝1琛ㄧず鏈夋ā鍧楋紝2琛ㄧず鏈夋搷浣�
- long l = platformClientUtil.getFrameworkService().checkChildObject(parentId);
-
-// funcObj.setFuncType(funcType);
-//
-// if(funcType == 1){
-// FunctionObject[] funcObjs = new FunctionClientDelegate().getModuleListByParentId(funcObj.getId(),false);
-// for(int i=0;i<funcObjs.length;i++){
-// VCIBaseTreeNode curNode = new VCIBaseTreeNode(funcObjs[i].getName(), funcObjs[i]);
-// treeModel.insertNodeInto(curNode, node,node.getChildCount());
-// setChildNode(curNode,funcObjs[i]);
-// }
-// }else if(funcType == 2){
-// FuncOperationObject[] funcOperateObjs = new FuncOperationClientDelegate().getFuncOperationByModuleId(funcObj.getId(), "", true);
-// for (int j = 0; j < funcOperateObjs.length; j++) {
-// VCIBaseTreeNode childNode = new VCIBaseTreeNode(funcOperateObjs[j].getOperAlias(),funcOperateObjs[j]);
-// UserObject user = rightManagementClient.fetchUserInfoByName(PLTApplication.getUserEntityObject().getUserName());
-//// if(user.getUserType() == 0 || childNode.toString().equals("鏌ョ湅")){
-//// treeModel.insertNodeInto(childNode, node,node.getChildCount());
-//// childNode.setLeaf(true);
-//// }else{
-//// boolean res = initRoleRightByType(childNode);
-//// if(res){
-// treeModel.insertNodeInto(childNode, node,node.getChildCount());
-// childNode.setLeaf(true);
-//// }
-//// }
-// }
-// }else{
-// functionVO.setHasChildren(false);
-// }
-//
-//
-//
-//
-//
-// int funcType = funcDel.checkChildObject(funcObj.getId());
-// funcObj.setFuncType(funcType);
-//
-//
- List<MenuVO> functionVOList = new ArrayList<>();
-// if(menus == null){
-// return functionVOList;
-// }
-// for (FunctionInfo menu : menus) {
-// if(!menu.isValid){
-// continue;
-// }
-// MenuVO functionVO = new MenuVO();
-// functionVO.setId(menu.id);
-// functionVO.setSource(menu.image);
-//// if(StringUtils.isBlank(menu.resourceB) ){
-//// continue;
-//// }
-// functionVO.setPath(menu.resourceB);
-// functionVO.setCode(menu.aliasName);
-// functionVO.setAlias(menu.aliasName);
-// functionVO.setParentId(menu.parentId);
-// functionVO.setName(menu.name);
-// functionVO.getMeta().put("keepAlive",false);
-// functionVO.setSort((int) menu.seq);
-// functionVO.setChildren(findChildAuthFunctionVO(menu.id,functionVO));
-// if(functionVO.getChildren().size() > 0){
-// functionVO.setHasChildren(true);
-// }else {
-// functionVO.setHasChildren(false);
-// }
-// functionVOList.add(functionVO);
-// }
- return functionVOList.stream().sorted(Comparator.comparing(s -> s.getSort())).collect(Collectors.toList());
+ long type = platformClientUtil.getFrameworkService().checkChildObject(functionVO.getId());
+ if(type == 1){
+ FunctionInfo[] funcObjs = platformClientUtil.getFrameworkService().getModuleListByParentId(functionVO.getId(), isAll);
+ for (FunctionInfo funcObj : funcObjs) {
+ MenuVO menuVO = new MenuVO();
+ menuVO.setId(funcObj.id);
+ menuVO.setSource(funcObj.image);
+ menuVO.setPath(funcObj.resourceB);
+ menuVO.setCode(funcObj.aliasName);
+ menuVO.setAlias(funcObj.aliasName);
+ menuVO.setParentId(funcObj.parentId);
+ menuVO.setChildType((int) type);
+ menuVO.setName(funcObj.name);
+ menuVO.getMeta().put("keepAlive",false);
+ menuVO.setSort((int) funcObj.seq);
+ findChildAuthFunctionVO(menuVO, isAll);
+ functionVO.getChildren().add(menuVO);
+ functionVO.setHasChildren(true);
+ }
+ }else if(type == 2){
+ FuncOperationInfo[] infos = platformClientUtil.getFrameworkService().getFuncOperationByModule(functionVO.getId(), "", true);
+ for (FuncOperationInfo info : infos) {
+ MenuVO menuVO = new MenuVO();
+ menuVO.setChildType((int) type);
+ menuVO.setId(info.id);
+ menuVO.setFuncId(info.funcId);
+ menuVO.setCode(info.operIndentify);
+ menuVO.setOperId(info.operId);
+ menuVO.setName(info.operName);
+ menuVO.setAlias(info.operAlias);
+ menuVO.setRemark(info.operDesc);
+ menuVO.setSort((int) info.number);
+ menuVO.setModeType("FunctionObject");
+ menuVO.setIsValid(info.isValid);
+ menuVO.setHasChildren(false);
+ functionVO.getChildren().add(menuVO);
+ functionVO.setHasChildren(true);
+ }
+ }else{
+ functionVO.setHasChildren(false);
+ }
}
@Override
@@ -595,6 +572,188 @@
}
}
return null;
+ }
+
+ /**
+ * 鑾峰彇鎺堟潈鐨勬ā鍧�
+ * @param roleId 瑙掕壊涓婚敭
+ * @return 鎵�鍏锋湁鏉冮檺鐨勪富閿�
+ * @throws PLException
+ */
+ @Override
+ public List<String> getSysModelAuth(String roleId) throws PLException {
+
+ RoleRightInfo[] roleRightList = platformClientUtil.getFrameworkService().getRoleRightList(roleId, WebUtil.getCurrentUserId());
+ Map<String, Long> authMap = Arrays.stream(roleRightList).collect(Collectors.toMap(e -> e.funcId, e -> e.rightValue,
+ (existing, replacement) -> existing));
+ String parentId;
+ SessionInfo sessionInfo = WebUtil.getCurrentUserSessionInfoNotException();
+ boolean adminOrDeveloperOrRoot = rightControlUtil.isAdminOrDeveloperOrRoot(sessionInfo.getUserId());
+ if (adminOrDeveloperOrRoot) {
+ //绯荤粺鑿滃崟
+ parentId = SYSTEMMANAGMENTNODE;
+ } else {
+ //鏅�氱敤鎴峰彧杩斿洖涓氬姟鍔熻兘妯″潡鐩稿叧鐨勮彍鍗�
+ parentId = ROOT_MENU_ID;
+ }
+ FunctionInfo[] moduleListByParentId = getModuleListByParentId(parentId, false);
+ List<String> authList = new ArrayList<>();
+ for (FunctionInfo functionInfo : moduleListByParentId) {
+ if(authMap.containsKey(functionInfo.id)){
+// authList.add(functionInfo.id);
+ getChildAuthNode(functionInfo, authMap, authList);
+ }
+ }
+ return authList;
+ }
+
+ public BaseResult saveRoleRight(List<RoleRightParamDTO> roleRightDTOS, String roleId) throws PLException {
+ /**
+ * 瀛樺偍闇�瑕佷繚瀛樼殑鏉冮檺
+ */
+ Map<String,RoleRightInfo> rightMap = new HashMap<String,RoleRightInfo>();
+
+ Map<String, List<RoleRightParamDTO>> parentMap = roleRightDTOS.stream().collect(Collectors.groupingBy(e -> e.parentId));
+
+ for (RoleRightParamDTO dto : roleRightDTOS) {
+ RoleRightInfo obj = null;
+ //鍒ゆ柇绫诲瀷
+ if(dto.getType() == 1 && !dto.getParentId().equals(ROOT_MENU_ID)
+ && !dto.getParentId().equals(SYSTEMMANAGMENTNODE)
+ && !dto.getParentId().equals(OPERATENODE)){
+ if(!rightMap.containsKey(dto.getParentId())){
+ obj = new RoleRightInfo();
+ obj.funcId = dto.getParentId();
+ obj.rightType = (short)1;
+ obj.rightValue = 1;//娌℃湁鎿嶄綔鐨勬ā鍧楁潈闄愬�煎瓨鍌ㄤ负0
+ obj.roleId = roleId;
+ obj.createUser = WebUtil.getCurrentUserId();
+ obj.createTime = new Date().getTime();
+ obj.modifyUser = WebUtil.getCurrentUserId();
+ obj.modifyTime = new Date().getTime();
+ obj.licensor = "";
+ }else{
+ obj = rightMap.get(dto.getParentId());
+ if (obj == null) {
+ obj = new RoleRightInfo();
+ obj.funcId = dto.getParentId();
+ obj.rightType = (short)1;
+ obj.rightValue = 1;//娌℃湁鎿嶄綔鐨勬ā鍧楁潈闄愬�煎瓨鍌ㄤ负0
+ obj.roleId = roleId;
+ obj.createUser = WebUtil.getCurrentUserId();
+ obj.createTime = new Date().getTime();
+ obj.modifyUser = WebUtil.getCurrentUserId();
+ obj.modifyTime = new Date().getTime();
+ obj.licensor = "";
+ }else {
+ obj.rightValue = 1;
+ }
+ }
+ rightMap.put(dto.getParentId(), obj);
+ }else if (dto.getType() == 2){
+// RoleRightInfo roleRightObj = new RoleRightInfo();
+ if(!rightMap.containsKey(dto.getParentId())) {
+ obj = new RoleRightInfo();
+ obj.funcId = dto.getParentId();
+ obj.rightType = (short)1;
+ obj.rightValue = countRightValue(parentMap.get(dto.getParentId()));//娌℃湁鎿嶄綔鐨勬ā鍧楁潈闄愬�煎瓨鍌ㄤ负0
+ obj.roleId = roleId;
+ obj.createUser = WebUtil.getCurrentUserId();
+ obj.createTime = new Date().getTime();
+ obj.modifyUser = WebUtil.getCurrentUserId();
+ obj.modifyTime = new Date().getTime();
+ obj.licensor = "";
+ rightMap.put(dto.getParentId(), obj);
+ }
+
+ }
+ }
+ /**涓婇潰澶勭悊瀹屾垚鍚庯紝寰幆閬嶅巻鍙栧嚭MAP閲岀殑瀵硅薄杩涜淇濆瓨**/
+ RoleRightInfo[] roleRightObjs = new RoleRightInfo[rightMap.size()];
+ Set<String> objSet = rightMap.keySet();
+ Iterator<String> it = objSet.iterator();
+ int i = 0;
+ while(it.hasNext()){
+ roleRightObjs[i++] = rightMap.get(it.next());
+ }
+ UserEntityInfo userEntityInfo = new UserEntityInfo();
+ userEntityInfo.setModules("com.vci.client.framework.rightdistribution.roleRight.RoleRightPanel");
+ userEntityInfo.setUserName(WebUtil.getCurrentUserId());
+ boolean res = platformClientUtil.getFrameworkService()
+ .saveRoleRight(roleRightObjs,roleId,WebUtil.getCurrentUserId(), userEntityInfo);
+ if(!res){
+ throw new PLException("500", new String[]{"鍔熻兘妯″潡鎺堟潈澶辫触锛�"});
+ }
+ return BaseResult.success();
+ }
+
+ /**
+ * 鑾峰彇鎵�鎺堟潈鐨勬ā鍧楁潈闄�
+ * @param roleName 鎼滅储鐨勮鑹�
+ * @return 瑙掕壊鍒楄〃
+ */
+ @Override
+ public List<RoleInfoDTO> getRoleList(String roleName) throws PLException {
+ RoleInfo[] roleInfos = platformClientUtil.getFrameworkService().fetchRoleInfoByUserType(WebUtil.getCurrentUserId());
+ List<RoleInfoDTO> dtos = new ArrayList<>();
+ for (RoleInfo roleInfo : roleInfos) {
+ if(StringUtils.isBlank(roleName) || roleInfo.name.indexOf(roleName) != -1) {
+ RoleInfoDTO dto = new RoleInfoDTO();
+ dto.setName(roleInfo.name);
+ dto.setDescription(roleInfo.description);
+ dto.setId(roleInfo.id);
+ dto.setGrantor(roleInfo.grantor);
+ dto.setType(roleInfo.type);
+ dto.setCreateTime(roleInfo.createTime);
+ dto.setCreateUser(roleInfo.createUser);
+ dto.setUpdateTime(roleInfo.updateTime);
+ dto.setUpdateUser(roleInfo.updateUser);
+ dtos.add(dto);
+ }
+ }
+ return dtos;
+ }
+
+ private long countRightValue(List<RoleRightParamDTO> dtos){
+ long value = 0;
+ for (RoleRightParamDTO dto : dtos) {
+ value += (long)Math.pow(2, dto.getNumber());//绱鍔犱笂鍚勪釜鎿嶄綔鐨勬潈闄愬��
+ }
+ return value;
+ }
+
+ /**
+ *
+ * @param funcObj 妯″潡瀵硅薄
+ * @param authMap 璇ヨ鑹蹭笅鎵�鏈夌殑鏉冮檺鏁版嵁
+ * @param authList 璇ヨ鑹蹭笅鎵�鍏锋湁鐨勬潈闄�
+ * @throws PLException
+ */
+ private void getChildAuthNode(FunctionInfo funcObj, Map<String, Long> authMap, List<String> authList) throws PLException {
+ /**0琛ㄧず璇ユā鍧椾笅浠�涔堥兘娌℃湁锛�1琛ㄧず鏈夋ā鍧楋紝2琛ㄧず鏈夋搷浣�**/
+ long funcType = platformClientUtil.getFrameworkService().checkChildObject(funcObj.id);
+ if(funcType == 1){
+ 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);
+ getChildAuthNode(funcInfos[i], authMap, authList);
+ }
+ }
+ }else if(funcType == 2){
+ FuncOperationInfo[] funcOperates = platformClientUtil.getFrameworkService().getFuncOperationByModule(funcObj.id, "", true);
+ for (int j = 0; j < funcOperates.length; j++) {
+ if(authMap.containsKey(funcOperates[j].funcId)){
+ long rightValue = authMap.get(funcOperates[j].funcId);
+ long nodeValue = funcOperates[j].number;
+ long preValue = (rightValue >> nodeValue) & 1;
+ //杩涜浣嶄笌鎿嶄綔锛屽鏋滅浉绛夊垯琛ㄧず鍏锋湁褰撳墠鎿嶄綔鐨勬潈闄�
+ if (preValue == 1) {
+ authList.add(funcOperates[j].id);
+ }
+ }
+ }
+ }
}
/**
@@ -934,32 +1093,24 @@
/**
* 閫氳繃妯″潡ID鑾峰彇瀛愮骇鍒楄〃
- * @param parentId
- * @param modeType 妯″潡绫诲瀷
* @param isAll 鏄惁鍖呮嫭鏃犳晥鐨勬ā鍧楋紝true鍒欏寘鎷�
* @return
* @throws VciBaseException
*/
@Override
- public List<MenuVO> getSysModelAuthTreeMenuByPID(String parentId,String modeType,boolean isAll) throws VciBaseException, PLException {
- List<MenuVO> menuVOList = new ArrayList<>();
- if(Func.isBlank(parentId)){
- return menuVOList;
- }
+ public List<MenuVO> getSysModelAuthTreeMenuByPID(boolean isAll) throws VciBaseException, PLException {
SessionInfo sessionInfo = WebUtil.getCurrentUserSessionInfoNotException();
boolean adminOrDeveloperOrRoot = rightControlUtil.isAdminOrDeveloperOrRoot(sessionInfo.getUserId());
+ String parentId;
if (adminOrDeveloperOrRoot) {
//绯荤粺鑿滃崟
- parentId = SYSTEMMANAGMENTNODE;
- } else if (rightControlUtil.isThreeAdminCurUser()) {
- //涓夊憳杩斿洖绠＄悊鍔熻兘妯″潡鐩稿叧鐨勮彍鍗�
parentId = SYSTEMMANAGMENTNODE;
} else {
//鏅�氱敤鎴峰彧杩斿洖涓氬姟鍔熻兘妯″潡鐩稿叧鐨勮彍鍗�
parentId = ROOT_MENU_ID;
}
List<MenuVO> functionVOList = new ArrayList<>();
- FunctionInfo[] moduleListByParentId = getModuleListByParentId(parentId, false);
+ FunctionInfo[] moduleListByParentId = getModuleListByParentId(parentId, isAll);
for (FunctionInfo menu : moduleListByParentId) {
if(!menu.isValid){
continue;
@@ -974,14 +1125,7 @@
functionVO.setName(menu.name);
functionVO.getMeta().put("keepAlive",false);
functionVO.setSort((int) menu.seq);
-// try {
-// functionVO.setChildren(findChildAuthFunctionVO(menu.id));
-// } catch (PLException e) {
-// e.printStackTrace();
-// String errorMsg = "鑿滃崟鏌ヨ鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
-// logger.error(errorMsg);
-// throw new VciBaseException(errorMsg);
-// }
+ findChildAuthFunctionVO(functionVO, isAll);
if(functionVO.getChildren().size() > 0){
functionVO.setHasChildren(true);
}else {
@@ -989,186 +1133,7 @@
}
functionVOList.add(functionVO);
}
-
-
-
-
- RoleRightInfo[] userRoleRights = rightControlUtil.getRoleRightByUserName(sessionInfo.getUserId());
- Map<String, List<FunctionInfo>> map = rightControlUtil.getAllChildrenFunctionsByUserName(
- parentId, sessionInfo.getUserId(), userRoleRights);
-
- if(Func.isEmpty(map.get(parentId))) {
- return functionVOList;
- }
- for (FunctionInfo menu : map.get(parentId)) {
- if(!menu.isValid){
- continue;
- }
- MenuVO functionVO = new MenuVO();
- functionVO.setId(menu.id);
- functionVO.setSource(menu.image);
- //if(StringUtils.isBlank(menu.resourceB)){
- // continue;
- //}
- functionVO.setPath(menu.resourceB);
- functionVO.setParentId(menu.parentId);
- functionVO.setCode(menu.aliasName);
- functionVO.setAlias(menu.aliasName);
- functionVO.setName(menu.name);
- functionVO.getMeta().put("keepAlive",false);
- functionVO.setSort((int) menu.seq);
-// try {
-// functionVO.setChildren(findChildAuthFunctionVO(menu.id, map));
-// } catch (PLException e) {
-// e.printStackTrace();
-// String errorMsg = "鑿滃崟鏌ヨ鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
-// logger.error(errorMsg);
-// throw new VciBaseException(errorMsg);
-// }
- if(functionVO.getChildren().size() > 0){
- functionVO.setHasChildren(true);
- }else {
- functionVO.setHasChildren(false);
- }
- functionVOList.add(functionVO);
- }
- //濡傛灉鏄紑鍙戞垨鑰呮祴璇曠敤鎴凤紝闇�鍝熻幏鍙栫郴缁熸ā鍧楅厤缃彍鍗�
- if(adminOrDeveloperOrRoot){
- //鑾峰彇棣栭〉绯荤粺妯″潡閰嶇疆鑿滃崟
- MenuVO menuVO = JsonConfigReader.getSysModuleConf().getSysModuleNode();
- if(Func.isNotEmpty(menuVO)){
- functionVOList.add(menuVO);
- }
- }
- return functionVOList.stream().sorted(Comparator.comparing(s -> s.getSort())).collect(Collectors.toList());
-
-
-
-
-
-//
-//
-//
-//
-// 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琛ㄧず鏄搷浣�**/
-// if(childType == 2){
-// try{
-// FuncOperationInfo[] infos = platformClientUtil.getFrameworkService().getFuncOperationByModule(parentId, "", false);
-// if(Func.isNotEmpty(infos.length)){
-// childType = this.checkChildObject(infos[0].id); //閮芥槸鍚屼竴灞傛墍浠ュ彇绗竴涓嵆鍙煡璇㈡槸浠�涔堢被鍨�
-// for(int i = 0;i < infos.length ;i++){
-// FuncOperationInfo info = infos[i];
-// MenuVO menuVO = new MenuVO();
-// menuVO.setChildType(childType);
-// menuVO.setId(info.id);
-// menuVO.setFuncId(info.funcId);
-// menuVO.setCode(info.operIndentify);
-// menuVO.setOperId(info.operId);
-// menuVO.setName(info.operName);
-// menuVO.setAlias(info.operAlias);
-// menuVO.setRemark(info.operDesc);
-// menuVO.setSort((int) info.number);
-// menuVO.setModeType("FunctionObject");
-// menuVO.setIsValid(info.isValid);
-// menuVO.setHasChildren(false);
-// menuVOList.add(menuVO);
-// }
-// }
-// }catch (PLException e) {
-// e.printStackTrace();
-// throw new VciBaseException(String.valueOf(e.code), e.messages);
-// }
-// }else if(childType == 1){
-// try{
-// FunctionInfo[] funcInfos = platformClientUtil.getFrameworkService().getModuleListByParentId(parentId, isAll);
-// if(Func.isNotEmpty(funcInfos.length)){
-// childType = this.checkChildObject(funcInfos[0].id); //閮芥槸鍚屼竴灞傛墍浠ュ彇绗竴涓嵆鍙煡璇㈡槸浠�涔堢被鍨�
-// 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) {
-// e.printStackTrace();
-// throw new VciBaseException(String.valueOf(e.code),e.messages);
-// }
-// }
-// } catch (Exception e) {
-// e.printStackTrace();
-// throw new VciBaseException("妯″潡鏌ヨ鏃跺嚭鐜伴敊璇紝鍘熷洜锛�"+VciBaseUtil.getExceptionMessage(e));
-// }
-// }else{
-// try{
-// MenuVO parentNode = null;
-// //灏嗚繑鍥炵殑鑺傜偣澶栧眰濂椾笂褰撳墠鐖惰妭鐐�
-// if("systemManagmentNode".equals(parentId)){
-// parentNode = JsonConfigReader.getSysModuleConf().getSystemManagmentNode();
-// }else if("modelManagmentNode".equals(parentId)){
-// parentNode = JsonConfigReader.getSysModuleConf().getModelManagmentNode();
-// }
-// //濡傛灉鏌ヨ鐨勬槸绗竴灞傝妭鐐瑰氨闇�瑕佺洿鎺ヨ繑鍥瀞ystemManagmentNode鎴杕odelManagmentNode鑺傜偣
-// if(Func.isNotBlank(modeType) && modeType.equals("firstNode")){
-// menuVOList.add(parentNode);
-// return menuVOList;
-// }
-// //鏌ヨ鐨勪笁绾ц妭鐐�
-// 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");
-// menuVO.setChildType(childType);
-// menuVOList.add(menuVO);
-// }
-// return menuVOList;
-// }catch (PLException e) {
-// e.printStackTrace();
-// throw new VciBaseException(String.valueOf(e.code),e.messages);
-// }
-// }
-// }
-// else if(parentId.equals("operateNode")){
-// //鍔犺浇鎵�鏈夋搷浣�
-// try{
-// //灏嗚繑鍥炵殑鑺傜偣澶栧眰濂椾笂褰撳墠鐖惰妭鐐�
-// MenuVO parentNode = JsonConfigReader.getSysModuleConf().getOperateNode();
-// //濡傛灉鏌ヨ鐨勬槸绗竴灞傝妭鐐瑰氨闇�瑕佺洿鎺ヨ繑鍥瀞ysOptionNode鑺傜偣
-// if(Func.isNotBlank(modeType) && modeType.equals("firstNode")){
-// menuVOList.add(parentNode);
-// return menuVOList;
-// }
-// OperateInfo[] operateInfos = platformClientUtil.getFrameworkService().getOperateTreeList(parentId);
-// for(int i = 0; i < operateInfos.length;i++ ){
-// OperateInfo operateInfo = operateInfos[i];
-// MenuVO menuVO = new MenuVO();
-// menuVO.setId(operateInfo.id);
-// menuVO.setName(operateInfo.name);
-// 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);
-// }
-// }catch (PLException e) {
-// e.printStackTrace();
-// throw new VciBaseException(String.valueOf(e.code),new String[]{VciBaseUtil.getExceptionMessage(e)});
-// }
-// }
-// return null;
-// return menuVOList.stream().sorted(Comparator.comparing(s -> s.getSort())).collect(Collectors.toList());
+ return functionVOList;
}
--
Gitblit v1.9.3