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 | 315 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 307 insertions(+), 8 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 8422fbc..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
@@ -4,17 +4,20 @@
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.JSONReader;
import com.vci.client.ClientSession;
+import com.vci.client.common.objects.RoleObject;
import com.vci.common.exception.VciException;
import com.vci.common.locale.LocaleDisplay;
import com.vci.corba.common.PLException;
-import com.vci.corba.framework.data.FuncOperationInfo;
-import com.vci.corba.framework.data.FunctionInfo;
-import com.vci.corba.framework.data.OperateInfo;
-import com.vci.corba.framework.data.RoleRightInfo;
+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;
@@ -337,6 +340,8 @@
menuVO.setModeType("FunctionObject");
menuVO.setIsValid(info.isValid);
menuVO.setHasChildren(false);
+ menuVO.setCategory(1);
+ menuVO.setFunctionType(2);
menuVOList.add(menuVO);
}
}
@@ -354,6 +359,7 @@
MenuVO menuVO = this.functionInfoToMenuVO(funcInfo);
menuVO.setChildType(childType);
menuVO.setModeType("FunctionObject");
+ menuVO.setCategory(0);
menuVOList.add(menuVO);
}
}
@@ -386,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;
@@ -413,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);
@@ -435,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);
@@ -467,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();
@@ -489,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;
// }
@@ -510,6 +522,51 @@
return functionVOList.stream().sorted(Comparator.comparing(s -> s.getSort())).collect(Collectors.toList());
}
+ public void findChildAuthFunctionVO(MenuVO functionVO, boolean isAll) throws PLException {
+ //0琛ㄧず娌℃湁妯″潡涔熸病鏈夋搷浣滐紝1琛ㄧず鏈夋ā鍧楋紝2琛ㄧず鏈夋搷浣�
+ 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
public UIContentVO getUIContentByBtmTypeAndId(TreeQueryObject treeQueryObject, ResourceControlTypeEnum resourceControlTypeEnum) throws PLException {
SessionInfo sessionInfo = WebUtil.getCurrentUserSessionInfoNotException();
@@ -523,6 +580,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);
+ }
+ }
+ }
+ }
}
/**
@@ -858,4 +1097,64 @@
public void clearCache() {
}
+
+
+ /**
+ * 閫氳繃妯″潡ID鑾峰彇瀛愮骇鍒楄〃
+ * @param isAll 鏄惁鍖呮嫭鏃犳晥鐨勬ā鍧楋紝true鍒欏寘鎷�
+ * @return
+ * @throws VciBaseException
+ */
+ @Override
+ 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 {
+ //鏅�氱敤鎴峰彧杩斿洖涓氬姟鍔熻兘妯″潡鐩稿叧鐨勮彍鍗�
+ parentId = ROOT_MENU_ID;
+ }
+ List<MenuVO> functionVOList = new ArrayList<>();
+ FunctionInfo[] moduleListByParentId = getModuleListByParentId(parentId, isAll);
+ for (FunctionInfo menu : moduleListByParentId) {
+ if(!menu.isValid){
+ continue;
+ }
+ MenuVO functionVO = new MenuVO();
+ functionVO.setId(menu.id);
+ functionVO.setSource(menu.image);
+ 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);
+ findChildAuthFunctionVO(functionVO, isAll);
+ if(functionVO.getChildren().size() > 0){
+ functionVO.setHasChildren(true);
+ }else {
+ functionVO.setHasChildren(false);
+ }
+ functionVOList.add(functionVO);
+ }
+ return functionVOList;
+ }
+
+
+ /**
+ * 閫氳繃妯″潡ID鑾峰彇瀛愮骇鍒楄〃
+ * @param parentId
+ * @param isAll 鏄惁鍖呮嫭鏃犳晥鐨勬ā鍧楋紝true鍒欏寘鎷�
+ * @return
+ * @throws VciException
+ */
+ public FunctionInfo[] getModuleListByParentId(String parentId,boolean isAll) throws PLException {
+ FunctionInfo[] funcInfos = null;
+ funcInfos = platformClientUtil.getFrameworkService().getModuleListByParentId(parentId, isAll);
+ return funcInfos;
+ }
}
--
Gitblit v1.9.3