Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIManagerServiceImpl.java
@@ -1,5 +1,7 @@
package com.vci.web.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.vci.common.utility.ObjectUtility;
import com.vci.corba.common.PLException;
import com.vci.corba.common.data.UserEntityInfo;
@@ -1075,6 +1077,7 @@
                break;
        }
        d.setNavigatorType(pdVO.getNavigatorType());
        d = setEventDataToPLDefination(d,pdVO);
        //转xml赋值到plDefination中
        pd.plDefination = UITools.getPLDefinationText(d);
@@ -1191,7 +1194,7 @@
                d = ulci.getNewPLDefination(d);
                break;
        }
        d.setNavigatorType(pdVO.getNavigatorType());
        d = setEventDataToPLDefination(d,pdVO);
        pd.plDefination = UITools.getPLDefinationText(d);
@@ -1366,7 +1369,7 @@
     */
    @Override
    public BaseResult addTabButton(PLTabButtonVO tabButtonVO) {
        boolean res = this.saveOrUpdateTapButton(tabButtonVO, true);
        boolean res = this.saveOrUpdateTabButton(tabButtonVO, true);
        return res ? BaseResult.success("按钮配置添加成功!"):BaseResult.success("按钮配置添加失败!");
    }
@@ -1377,7 +1380,7 @@
     */
    @Override
    public BaseResult updateTabButton(PLTabButtonVO tabButtonVO) {
        boolean res = this.saveOrUpdateTapButton(tabButtonVO, false);
        boolean res = this.saveOrUpdateTabButton(tabButtonVO, false);
        return res ? BaseResult.success("按钮配置修改成功!"):BaseResult.success("按钮配置修改失败!");
    }
@@ -1387,11 +1390,10 @@
     * @return
     */
    @Override
    public boolean saveOrUpdateTapButton(PLTabButtonVO tabButtonVO,boolean isAdd){
        VciBaseUtil.alertNotNull(tabButtonVO,"按钮配置对象",tabButtonVO.getLabel(),"参数名称");
    public boolean saveOrUpdateTabButton(PLTabButtonVO tabButtonVO,boolean isAdd){
        VciBaseUtil.alertNotNull(tabButtonVO,"按钮配置对象",tabButtonVO.getLabel(),"参数名称",tabButtonVO.getTableOId(),"页面定义主键");
        //检查当前添加的列表是否重复,但是这儿只支持单条数据保存,所有当前列表判重可以前端来做
        //String btnParamValidate = this.geCheckRes();
        if (tabButtonVO.getSeq() < 1 || tabButtonVO.getSeq() > 63) {
            throw new VciBaseException("按序号超出范围,请修改,按钮【编号】只能在【1-63】范围内。");
        }
@@ -1776,18 +1778,25 @@
        treeQueryObject.setConditionMap(conditionMap);
        List<Tree> treeList = this.getUIAuthor(treeQueryObject);
        HashMap<String,Tree> allTreeMap = new HashMap<>();
        Map<String,RoleRightDTO> roleRightVOMap = new HashMap<>();
        //Map<String,RoleRightDTO> roleRightVOMap = new HashMap<>();
        if(!CollectionUtil.isEmpty(treeList)){
            if(StringUtils.isNotBlank(uiAuthorDTO.getRoleId())){
            /*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 ->roleRightVOO2DTO(roleRightVO),(oldValue,newValue)->oldValue));
            }
            }*/
            convertTreeDOO2Map(treeList,allTreeMap);
            List<RoleRightDTO> roleRightDTOList = new ArrayList<>();
            List<Tree> selectTreeList = uiAuthorDTO.getSelectTreeList();
            getSelectedRoleRightObjs(uiAuthorDTO.getRoleId(),selectTreeList,allTreeMap,roleRightVOMap,roleRightDTOList);
            List<Tree> filterSelectTreeList = this.authTreeListConvert(selectTreeList);
            //过滤出选择的按钮
            List<String> checkButtonList = selectTreeList.stream()
                    .filter(item -> item.getData() instanceof PLTabButton || item.isLeaf())
                    .map(item -> item.getOid()).collect(Collectors.toList());
            getSelectedRoleRightObjs(uiAuthorDTO.getRoleId(),filterSelectTreeList,checkButtonList,allTreeMap,roleRightDTOList);
            SessionInfo sessionInfo = WebThreadLocalUtil.getCurrentUserSessionInfoInThread();
            String currentUserName = sessionInfo.getUserId();
            //boolean isDeveloper = rightControlUtil.isDeveloper(currentUserName);
@@ -1805,26 +1814,42 @@
    }
    /**
     * 获取筛选后的数据
     * @param selectTreeList
     */
    private List<Tree> authTreeListConvert(List<Tree> selectTreeList){
        // 创建一个包含另一个集合中满足条件的 oid 的集合
        List<String> validOids = selectTreeList.stream()
                .filter(Tree::isChecked) // checked 为 true
                .map(Tree::getOid)      // 提取 oid
                .collect(Collectors.toList());
        return selectTreeList.stream()
                .filter(tree -> tree.isChecked() && !validOids.contains(tree.getParentId())) // 过滤条件
                .collect(Collectors.toList());
    }
    /**
     *根据权限计算上下权限
     * @param roleOid
     * @param selectTreeList
     * @param allTreeMap
     * @param roleRightDTOList
     */
    private void getSelectedRoleRightObjs(String roleOid, List<Tree> selectTreeList, HashMap<String,Tree> allTreeMap, Map<String,RoleRightDTO> allRoleRightDTOMap, List<RoleRightDTO> roleRightDTOList){
        //Date date=new Date();
    private void getSelectedRoleRightObjs(String roleOid, List<Tree> selectTreeList, List<String> checkButtonList, HashMap<String,Tree> allTreeMap, List<RoleRightDTO> roleRightDTOList){
        Map<String,RoleRightDTO> roleRightDTOMap = new HashMap<>();
        if(!CollectionUtil.isEmpty(selectTreeList)){
            selectTreeList.stream().forEach(tree -> {
                String oid = tree.getOid();
                if(allTreeMap.containsKey(oid)){
                    tree = allTreeMap.get(oid);
                   Object data = tree.getData();
                    Object data = tree.getData();
                    if (data instanceof String) {
                        getRightValue(roleOid, tree, allTreeMap, false, roleRightDTOMap);//向下获取所有模块的权限值
                        getRightValue(roleOid, tree, allTreeMap, checkButtonList,false, roleRightDTOMap);//向下获取所有模块的权限值
                    } else if (!(data instanceof PLTabButton)) {//业务类型
                        getRightValue(roleOid, tree, allTreeMap, true, roleRightDTOMap);//向上处理
                        getRightValue(roleOid, tree, allTreeMap, false, roleRightDTOMap);//向下处理(包含当前节点)
                        getRightValue(roleOid, tree, allTreeMap, checkButtonList, true, roleRightDTOMap);//向上处理
                        getRightValue(roleOid, tree, allTreeMap, checkButtonList, false, roleRightDTOMap);//向下处理(包含当前节点)
                    } else if (data instanceof PLTabButton) {//按钮
                        String parrentId=tree.getParentId();
                        if(allTreeMap.containsKey(parrentId)){
@@ -1833,7 +1858,7 @@
                            boolean isDeveloper = rightControlUtil.isDeveloper(currentUserName);
                            Tree parentNode= allTreeMap.get(parrentId);
                            String funcId = parentNode.getOid();
                            getRightValue(roleOid, tree, allTreeMap, true, roleRightDTOMap);//向上处理该操作父级的上级模块权限(不包含父节点)
                            getRightValue(roleOid, parentNode, allTreeMap, checkButtonList, true, roleRightDTOMap);//向上处理该操作父级的上级模块权限(不包含父节点)
                            if(!roleRightDTOMap.containsKey(funcId)){
                                RoleRightDTO roleRightDTO = new RoleRightDTO();
                                roleRightDTO.setId(ObjectUtility.getNewObjectID36());//主键
@@ -1844,7 +1869,7 @@
                                }else{
                                    roleRightDTO.setRightType((short) 2);
                                }
                                roleRightDTO.setRightValue(1);// 权限值,没有操作的模块权限值存储为0
                                roleRightDTO.setRightValue(countRightValue(parentNode,checkButtonList,false));// 权限值,没有操作的模块权限值存储为0
                                roleRightDTO.setRoleId(roleOid);//角色ID
                                roleRightDTO.setCreateUser(currentUserName);//创建者
                                roleRightDTO.setCreateTime(VciDateUtil.date2Str(new Date(),""));//创建时间
@@ -1873,16 +1898,18 @@
     * 获取权限
     * @param isUp 是否是向上获取,如果是向上获取,传进来的必然是模块节点,且上级模块必然是没有选中
     */
    private void getRightValue(String roleId,Tree node,HashMap<String,Tree> allTreeMap,boolean isUp,Map<String,RoleRightDTO> rightMap){
    private void getRightValue(String roleId,Tree node,Map<String,Tree> allTreeMap,List<String> checkButton,boolean isUp,Map<String,RoleRightDTO> rightMap){
        SessionInfo sessionInfo = WebThreadLocalUtil.getCurrentUserSessionInfoInThread();
        String currentUserName = sessionInfo.getUserId();
        boolean isDeveloper= rightControlUtil.isDeveloper(currentUserName);
        String id=ObjectUtility.getNewObjectID36();
        Object data=node.getData();
        if(isUp) {//向上获取,存储每个上级模块的权限值
            while (!"root".equals(node.getData())){
                data=node.getData();
               String oid=node.getOid();
            String parentId = node.getParentId();
            Tree parentNode = allTreeMap.get(parentId);
            while (!"root".equals(parentNode.getData())){
                data=parentNode.getData();
                String oid=parentNode.getOid();
                if(allTreeMap.containsKey(oid)){
                    String funcId = "";
                    if (data instanceof BizType) {
@@ -1919,9 +1946,9 @@
                    if(!rightMap.containsKey(funcId)){
                        rightMap.put(funcId, roleRightDTO);
                    }
                    oid= node.getParentId();
                    oid = parentNode.getParentId();
                    if(allTreeMap.containsKey(oid)) {
                        node=allTreeMap.get(oid);
                        parentNode = allTreeMap.get(oid);
                    }
                }
            }
@@ -1965,14 +1992,14 @@
                }
                for (int i = 0; i < node.getChildren().size(); i++) {
                    //对每个子向下递归遍历
                    getRightValue(roleId, node.getChildren().get(i), allTreeMap, false, rightMap);
                    getRightValue(roleId, node.getChildren().get(i), allTreeMap, checkButton,false, rightMap);
                }
            } else {
                if (!rightMap.containsKey(funcId)) {
                    RoleRightDTO roleRightDTO = new RoleRightDTO();
                    roleRightDTO.setFuncId(funcId);
                    roleRightDTO.setRightType((short) 2); // 设置UI权限
                    roleRightDTO.setRightValue(countRightValue(node, true));//没有操作的模块权限值存储为0
                    roleRightDTO.setRightValue(countRightValue(node, checkButton,true));//没有操作的模块权限值存储为0
                    roleRightDTO.setRoleId(roleId);
                    roleRightDTO.setCreateUser(currentUserName);
@@ -1992,12 +2019,13 @@
     * @param isAll 是否子级全部选中
     * @return
     */
    private long countRightValue(Tree node,boolean isAll){
    private long countRightValue(Tree node,List<String> checkButton,boolean isAll){
        long value = 0;
        for(int i = 0;i < node.getChildren().size();i++){
        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();
            //node.getData() instanceof PLTabButton这儿应该换成是否是选中的按钮节点
            if(isAll || checkButton.contains(node.getOid())){
                PLTabButton obj = (PLTabButton)childNode.getData();
                value += (long)Math.pow(2, obj.plSeq);//累计加上各个操作的权限值
            }
        }