From 88c5cf35a5ea870378d7964086ed2c09ddc299c8 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 09 九月 2024 17:52:05 +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/UIManagerServiceImpl.java | 193 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 170 insertions(+), 23 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIManagerServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIManagerServiceImpl.java
index 137973d..7cff12c 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIManagerServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIManagerServiceImpl.java
@@ -33,6 +33,7 @@
import lombok.NoArgsConstructor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
@@ -57,6 +58,16 @@
@Resource
private PlatformClientUtil platformClientUtil;
+ /**
+ * 瑙掕壊
+ */
+ @Resource
+ private SmRoleQueryServiceI smRoleQueryServiceI;
+ /***
+ * 鏄惁鏄鐞嗗憳
+ */
+ @Autowired
+ RightControlUtil rightControlUtil;
/**
* 涓氬姟绫诲瀷
*/
@@ -1093,6 +1104,12 @@
return treeList;
}
+ /***
+ * UI鎺堟潈
+ * @param uiAuthorDTO
+ * @return
+ * @throws Exception
+ */
@Override
public boolean authorizedUI(UIAuthorDTO uiAuthorDTO) throws Exception {
boolean res=false;
@@ -1108,41 +1125,41 @@
treeQueryObject.setConditionMap(conditionMap);
List<Tree> treeList=this.getUIAuthor(treeQueryObject);
HashMap<String,Tree> allTreeMap=new HashMap<>();
+ Map<String,RoleRightVO> roleRightVOMap=new HashMap<>();
if(!CollectionUtil.isEmpty(treeList)){
+ if(StringUtils.isNotBlank(uiAuthorDTO.getRoleId())){
+ String userName= WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId();
+ RoleRightInfo[] rightInfos= platformClientUtil.getFrameworkService().getRoleRightList(uiAuthorDTO.getRoleId(),userName);
+ List<RoleRightVO> roleRightVOList=roleRightDOO2VOS(Arrays.asList(rightInfos));
+ roleRightVOMap=roleRightVOList.stream().collect(Collectors.toMap(RoleRightVO::getFuncId,roleRightVO ->roleRightVO));
+ }
convertTreeDOO2Map(treeList,allTreeMap);
List<RoleRightDTO> roleRightDTOList=new ArrayList<>();
List<Tree> selectTreeList= uiAuthorDTO.getSelectTreeList();
- getRoleRightDTOS(uiAuthorDTO.getRoleId(),selectTreeList,allTreeMap,roleRightDTOList);
+ getSelectedRoleRightObjs(uiAuthorDTO.getRoleId(),selectTreeList,allTreeMap,roleRightDTOList);
}
return res;
}
- private void getRoleRightDTOS(String roleOid,List<Tree> selectTreeList,HashMap<String,Tree> allTreeMap, List<RoleRightDTO> roleRightDTOList){
+ /**
+ *
+ * @param roleOid
+ * @param selectTreeList
+ * @param allTreeMap
+ * @param roleRightDTOList
+ */
+ private void getSelectedRoleRightObjs(String roleOid,List<Tree> selectTreeList,HashMap<String,Tree> allTreeMap, List<RoleRightDTO> roleRightDTOList){
+ Date date=new Date();
+ Map<String,RoleRightDTO> roleRightDTOMap=new HashMap<>();
selectTreeList.stream().forEach(tree -> {
RoleRightDTO roleRightDTO=new RoleRightDTO();
String id=ObjectUtility.getNewObjectID36();
Object data= tree.getData();
-
- if (data instanceof BizType) {//涓氬姟绫诲瀷
- BizType bizType=(BizType)data;
- roleRightDTO.setId(id);//涓婚敭
- roleRightDTO.setCreateUser(null);//鍒涘缓鑰�
- roleRightDTO.setCreateTime(null);//鍒涘缓鏃堕棿
- roleRightDTO.setModifyUser(null);//淇敼鑰�
- roleRightDTO.setModifyTime(null);//淇敼鏃堕棿
- roleRightDTO.setRoleId(roleOid);//瑙掕壊ID
- roleRightDTO.setRightValue(1);// 鏉冮檺鍊�
- roleRightDTO.setRightType((short) -1);//鏉冮檺绫诲瀷 鏉冮檺绫诲瀷锛岃秴绾х鐞嗗憳缁欑鐞嗗憳鎺堟潈涓�1锛岀鐞嗗憳缁欐櫘閫氱敤鎴锋巿鏉冧负2
- roleRightDTO.setFuncId(null);
- roleRightDTO.setLicensor(null);
- }else if (data instanceof PLUILayout){//UI
-
- }else if (data instanceof PLTabPage) {//UI涓婁笅鏂�
-
-
- }else if (data instanceof PLPageDefination) {//
-
-
+ if(data instanceof String){
+ getRightValue(roleOid,tree,allTreeMap,false,roleRightDTOMap);//鍚戜笅鑾峰彇鎵�鏈夋ā鍧楃殑鏉冮檺鍊�
+ }else if (!(data instanceof PLTabButton)) {//涓氬姟绫诲瀷
+ getRightValue(roleOid,tree,allTreeMap,true,roleRightDTOMap);//鍚戜笂澶勭悊
+ getRightValue(roleOid,tree,allTreeMap,false,roleRightDTOMap);//鍚戜笅澶勭悊锛堝寘鍚綋鍓嶈妭鐐癸級
}else if (data instanceof PLTabButton) {//鎸夐挳
}
@@ -1151,6 +1168,136 @@
}
+ /**
+ * 鑾峰彇鏉冮檺
+ * @param isUp 鏄惁鏄悜涓婅幏鍙栵紝濡傛灉鏄悜涓婅幏鍙栵紝浼犺繘鏉ョ殑蹇呯劧鏄ā鍧楄妭鐐癸紝涓斾笂绾фā鍧楀繀鐒舵槸娌℃湁閫変腑
+ */
+ private void getRightValue(String roleId,Tree node,HashMap<String,Tree> allTreeMap,boolean isUp,Map<String,RoleRightDTO> rightMap){
+ SessionInfo sessionInfo = WebThreadLocalUtil.getCurrentUserSessionInfoInThread();
+ String currentUserName = sessionInfo.getUserId();
+ boolean isDeveloper= rightControlUtil.isDeveloper(currentUserName);
+ String parentOid=node.getParentId();
+ if(allTreeMap.containsKey(parentOid)){
+ String id=ObjectUtility.getNewObjectID36();
+ Tree parentNode =allTreeMap.get(parentOid);
+ Object parentData= parentNode.getData();
+ if(isUp) {//鍚戜笂鑾峰彇锛屽瓨鍌ㄦ瘡涓笂绾фā鍧楃殑鏉冮檺鍊�
+ while (!"root".equals(parentNode.getData())){
+ String funcId = "";
+ if (parentData instanceof BizType) {
+ BizType bizType = (BizType) parentData;
+ funcId = bizType.name;
+ } else if (parentData instanceof PLUILayout) {
+ PLUILayout context = (PLUILayout)parentData;
+ funcId = context.plOId;
+ } else if (parentData instanceof PLTabPage) {
+ PLTabPage tab = (PLTabPage) parentData;
+ funcId = tab.plOId;
+ } else if (parentData instanceof PLPageDefination){
+ PLPageDefination pageDef = (PLPageDefination) parentData;
+ funcId = pageDef.plOId;
+ } else if (parentData instanceof PLTabButton) {
+ PLTabButton but = (PLTabButton)parentData;
+ funcId = but.plOId;
+ }
+ RoleRightDTO roleRightDTO = new RoleRightDTO();
+ roleRightDTO.setId(id);//涓婚敭
+ roleRightDTO.setFuncId(funcId);
+ if(isDeveloper) {
+ roleRightDTO.setRightType((short) 1);//鏉冮檺绫诲瀷 鏉冮檺绫诲瀷锛岃秴绾х鐞嗗憳缁欑鐞嗗憳鎺堟潈涓�1锛岀鐞嗗憳缁欐櫘閫氱敤鎴锋巿鏉冧负2
+ }else{
+ roleRightDTO.setRightType((short) 2);
+ }
+ roleRightDTO.setRightValue(1);// 鏉冮檺鍊硷紝娌℃湁鎿嶄綔鐨勬ā鍧楁潈闄愬�煎瓨鍌ㄤ负0
+ roleRightDTO.setRoleId(roleId);//瑙掕壊ID
+ roleRightDTO.setCreateUser(currentUserName);//鍒涘缓鑰�
+ roleRightDTO.setCreateTime(new Date());//鍒涘缓鏃堕棿
+ roleRightDTO.setModifyUser(currentUserName);//淇敼鑰�
+ roleRightDTO.setModifyTime(new Date());//淇敼鏃堕棿
+ roleRightDTO.setLicensor("");
+ if(!rightMap.containsKey(funcId)){
+ rightMap.put(funcId, roleRightDTO);
+ }
+ }
+ }else{
+ String funcId = "";
+ if(parentData instanceof String){
+ funcId = (String)parentData;
+ } else if (parentData instanceof BizType) {
+ BizType bizType = (BizType)parentData;
+ funcId = bizType.name;
+ } else if (parentData instanceof PLUILayout) {
+ PLUILayout context = (PLUILayout)parentData;
+ funcId = context.plOId;
+ } else if (parentData instanceof PLTabPage) {
+ PLTabPage tab = (PLTabPage) parentData;
+ funcId = tab.plOId;
+ } else if (parentData instanceof PLPageDefination){
+ PLPageDefination pageDef = (PLPageDefination) parentData;
+ funcId = pageDef.plOId;
+ } else if (parentData instanceof PLTabButton) {
+ PLTabButton but = (PLTabButton)parentData;
+ funcId = but.plOId;
+ }
+ if(!(parentData instanceof PLPageDefination)) {//瀛愯妭鐐逛笉鏄搷浣�
+ if(!rightMap.containsKey(funcId)&&!funcId.equals("root")){
+ RoleRightDTO roleRightDTO = new RoleRightDTO();
+ roleRightDTO.setFuncId(funcId);
+ if(isDeveloper) {
+ roleRightDTO.setRightType((short) 1);//鏉冮檺绫诲瀷 鏉冮檺绫诲瀷锛岃秴绾х鐞嗗憳缁欑鐞嗗憳鎺堟潈涓�1锛岀鐞嗗憳缁欐櫘閫氱敤鎴锋巿鏉冧负2
+ }else{
+ roleRightDTO.setRightType((short) 2);
+ }
+ roleRightDTO.setRightValue(0);//娌℃湁鎿嶄綔鐨勬ā鍧楁潈闄愬�煎瓨鍌ㄤ负0
+ roleRightDTO.setRoleId(roleId);
+ roleRightDTO.setCreateUser(currentUserName);
+ roleRightDTO.setCreateTime(new Date());
+ roleRightDTO.setModifyUser(currentUserName);
+ roleRightDTO.setModifyTime(new Date());
+ roleRightDTO.setLicensor("");
+ rightMap.put(funcId, roleRightDTO);
+ }
+ for(int i = 0;i < parentNode.getChildren().size();i++){
+ //瀵规瘡涓瓙鍚戜笅閫掑綊閬嶅巻
+ getRightValue(roleId,parentNode.getChildren().get(i),allTreeMap,false,rightMap);
+ }
+ }else {
+ if(!rightMap.containsKey(funcId)){
+ RoleRightDTO roleRightDTO = new RoleRightDTO();
+ roleRightDTO.setFuncId(funcId);
+ roleRightDTO.setRightType((short)2); // 璁剧疆UI鏉冮檺
+ roleRightDTO.setRightValue(countRightValue(parentNode,true));//娌℃湁鎿嶄綔鐨勬ā鍧楁潈闄愬�煎瓨鍌ㄤ负0
+ roleRightDTO.setRoleId(roleId);
+
+ roleRightDTO.setCreateUser(currentUserName);
+ roleRightDTO.setCreateTime(new Date());
+ roleRightDTO.setModifyUser(currentUserName);
+ roleRightDTO.setModifyTime(new Date());
+ roleRightDTO.setLicensor("");
+ rightMap.put(funcId, roleRightDTO);
+ }
+ }
+ }
+
+ }
+ }
+ /**
+ * 浼犲叆鐩存帴鎸傛帴鎿嶄綔鐨勬ā鍧楃殑鑺傜偣,璁＄畻璇ヨ妭鐐圭殑鏉冮檺鍊�
+ * @param node 妯″潡鑺傜偣
+ * @param isAll 鏄惁瀛愮骇鍏ㄩ儴閫変腑
+ * @return
+ */
+ private long countRightValue(Tree node,boolean isAll){
+ long value = 0;
+ for(int i = 0;i < node.getChildren().size();i++){
+ Tree childNode = (Tree)node.getChildren().get(i);
+ if(isAll && node.getData() instanceof PLTabButton ){
+ PLTabButton obj = (PLTabButton)node.getData();
+ value += (long)Math.pow(2, obj.plSeq);//绱鍔犱笂鍚勪釜鎿嶄綔鐨勬潈闄愬��
+ }
+ }
+ return value;
+ }
/**
*
--
Gitblit v1.9.3