From a899eae792897cb014b9291562f32f5786cfb1f4 Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期四, 16 一月 2025 15:51:13 +0800
Subject: [PATCH] UI授权后，由于一个用户拥有多个角色问题，没有权限的角色可能会把有权限的角色数据替换，进行修改
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIManagerServiceImpl.java | 56 ++++++++++++++++++++++++++++----------------------------
1 files changed, 28 insertions(+), 28 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 769c3ae..e6b6c33 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
@@ -45,7 +45,7 @@
import java.util.stream.Collectors;
/**
- * UI瀹氫箟鏈嶅姟鐣岄潰鐩稿叧鎺ュ彛
+ * UI瀹氫箟绠＄悊鏈嶅姟鐣岄潰鐩稿叧鎺ュ彛
* @author ludc
* @date 2024/8/28 17:05
*/
@@ -849,9 +849,11 @@
public DataGrid getTabByContextIdAndType(String contextId, int areaType) throws PLException {
VciBaseUtil.alertNotNull(contextId,"涓婁笅鏂囦富閿�",areaType,"鍖哄煙绫诲瀷");
PLTabPage[] plTabPages = platformClientUtil.getUIService().getTabPagesByContextIdAndType(contextId, (short) areaType);
+ List<PLTabPage> tabPageList = Arrays.stream(plTabPages).sorted(((o1, o2) -> Math.toIntExact(o1.plSeq - o2.plSeq)))
+ .collect(Collectors.toList());
DataGrid dataGrid = new DataGrid();
dataGrid.setTotal(plTabPages.length);
- dataGrid.setData(Arrays.asList(plTabPages));
+ dataGrid.setData(tabPageList);
return dataGrid;
}
@@ -1694,12 +1696,9 @@
String type = StringUtils.isBlank(conditionMap.get("type")) ? "" : conditionMap.get("type");
String context = StringUtils.isBlank(conditionMap.get("context")) ? "" : conditionMap.get("context");
boolean showCheckBox = Boolean.parseBoolean(conditionMap.get("showCheckBox"));
- Map<String,RoleRightVO> roleRightVOMap = new HashMap<>();
+ Map<String, List<RoleRightVO>> roleRightVOMap = new HashMap<>();
if(StringUtils.isNotBlank(roleId)){
- String userName = WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId();
- RoleRightInfo[] rightInfos = platformClientUtil.getFrameworkService().getRoleRightList(roleId,userName);
- List<RoleRightVO> roleRightVOList = roleRightDOO2VOS(Arrays.asList(rightInfos));
- roleRightVOMap = roleRightVOList.stream().collect(Collectors.toMap(RoleRightVO::getFuncId,roleRightVO ->roleRightVO,(oldValue,newOldValue)->oldValue));
+ roleRightVOMap = this.getRoleRightMap(roleId);
}
BizType[] bizTypes = osBtmServiceI.getBizTypes(type);
List<Tree> treeList=new ArrayList<>();
@@ -1709,7 +1708,6 @@
rootNode.setExpanded(true);
List<Tree> childList=new ArrayList<>();
- //long startTime = System.currentTimeMillis();
uiDataFetcher = new UIDataFetcher();
for (int i = 0; i < bizTypes.length; i++) {
Tree bizTypeTree = new Tree(bizTypes[i].oid,bizTypes[i].name,bizTypes[i]);//(btmItems[i].label+" ["+ btmItems[i].name+"]", btmItems[i]);
@@ -1718,18 +1716,12 @@
bizTypeTree.setParentId(rootNode.getOid());
bizTypeTree.setParentName(rootNode.getText());
bizTypeTree.setParentBtmName(bizTypes[i].name);
- //long startTime1 = System.currentTimeMillis();
List<PLUILayout> contextList = uiDataFetcher.getContext(bizTypes[i].name/*+context*/);
- //long endTime1 = System.currentTimeMillis();
- //System.out.println("============================================鑾峰彇UI瀹氫箟鏁版嵁寮曟搸鑰楁椂锛�"+((endTime1-startTime1)/1000)+"s");
-
List<Tree> btmChildList = new ArrayList<>();
btmChildList.add(bizTypeTree);
setChildNode(btmChildList,contextList,roleRightVOMap,showCheckBox);
childList.add(bizTypeTree);
}
- //long endTime = System.currentTimeMillis();
- //System.out.println("============================================UI瀹氫箟鏍戣绠楀畬姣曡�楁椂锛�"+((endTime-startTime)/1000)+"s");
rootNode.setChildren(childList);
treeList.add(rootNode);
return treeList;
@@ -1737,21 +1729,27 @@
/**
* 鏍规嵁瑙掕壊涓婚敭鑾峰彇宸叉巿鏉冪殑淇℃伅
- * @param roleId
+ * @param roleId 濡傛灉roleId涓嶄紶锛屽氨浼氳幏鍙栧綋鍓嶇櫥褰曠殑鐢ㄦ埛鐨勫悕绉版煡璇㈡潈闄�
* @return
* @throws PLException
*/
- /* @Override
- public Map<String,RoleRightVO> getRightListByRoleId(String roleId) throws PLException {
- VciBaseUtil.alertNotNull(roleId,"鏌ヨ鏉′欢瑙掕壊涓婚敭");
- String userName = WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId();
- RoleRightInfo[] rightInfos= platformClientUtil.getFrameworkService().getRoleRightList(roleId,userName);
- List<RoleRightVO> roleRightVOList = roleRightDOO2VOS(Arrays.asList(rightInfos));
- Map<String,RoleRightVO> roleRightVOMap = roleRightVOList.stream().collect(Collectors.toMap(RoleRightVO::getFuncId,roleRightVO ->roleRightVO,(oldValue,newOldValue)->oldValue));
- return roleRightVOMap;
- }*/
+ @Override
+ public Map<String, List<RoleRightVO>> getRoleRightMap(String roleId) throws PLException {
+ RoleRightInfo[] rightInfos = null;
+ String userName = WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId();
+ if(Func.isBlank(roleId)){
+ rightInfos = platformClientUtil.getFrameworkService().getRoleRightByUserName(userName);
+ }else{
+ rightInfos = platformClientUtil.getFrameworkService().getRoleRightList(roleId,userName);
+ }
+ List<RoleRightVO> roleRightVOList = roleRightDOO2VOS(Arrays.asList(rightInfos));
+ //鍒嗙粍鎿嶄綔
+ Map<String, List<RoleRightVO>> roleRightVOMap = roleRightVOList.stream().collect(Collectors.groupingBy(RoleRightVO::getFuncId,
+ Collectors.mapping(e ->e, Collectors.toList())));
+ return roleRightVOMap;
+ }
- /***
+ /**
* UI鎺堟潈
* @param uiAuthorDTO
* @return
@@ -2149,7 +2147,7 @@
* @param contextList
* @param isShowCheckBox
*/
- private void setChildNode(List<Tree> parentTree, List<PLUILayout>contextList,Map<String,RoleRightVO> roleRightVOMap, boolean isShowCheckBox){
+ private void setChildNode(List<Tree> parentTree, List<PLUILayout>contextList,Map<String, List<RoleRightVO>> roleRightVOMap, boolean isShowCheckBox){
Optional.ofNullable(parentTree).orElseGet(()->new ArrayList<>()).stream().forEach(pTree -> {
Object funcObj = pTree.getData();
List<Tree> chiledTreeList = new ArrayList<>();
@@ -2228,8 +2226,8 @@
PLTabButton plTabButton = (PLTabButton) funcObj;
String id = plTabButton.plTableOId;
if(roleRightVOMap.containsKey(id)){
- RoleRightVO roleRightVO = roleRightVOMap.get(id);
- Long rightValue = roleRightVO.getRightValue();
+ RoleRightVO roleRightVO = roleRightVOMap.get(id).get(0);
+ Long rightValue = roleRightVO.getRightValue();
int nodeValue = plTabButton.plSeq;
if (nodeValue >= 0 && nodeValue <= 63) {
long preValue = (rightValue >> nodeValue) & 1;
@@ -3606,6 +3604,7 @@
d.setSearchTarger(searchTarger);
d.setShowType(btmType);
d.setTemplateId(txtVIName);
+ d.setOrientation("positive");
d.setQueryTemplateName(txtQTName);
d.setExpandCols(expandCols);
d.setExpandMode(expandMode);
@@ -3703,6 +3702,7 @@
d.setShowType(btmType);
d.setLinkType(linkType);
d.setTemplateId(queryTemplateName);
+ d.setOrientation("positive");
d.setRootContent(showExpressionRoot.trim());
d.setShowAbs(showExpression.trim());
d.setShowLinkAbs(refTreeSet.trim());
--
Gitblit v1.9.3