UI授权相关更改

 Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/redis/RedisService.java

@@ -397,9 +397,12 @@
    public void increOnlineUser(String currentLoggedUserKey) {
        // 检查键是否存在
        if (!redisTemplate.hasKey(currentLoggedUserKey)) {
            //log.info("===========================键不存在");
            // 如果键不存在，初始化为0
            redisTemplate.opsForValue().set(currentLoggedUserKey, 0);
        }
        int currentCount = (int)redisTemplate.opsForValue().get(currentLoggedUserKey);
        //log.info("===========================开始自增"+currentCount);
        // 自增在线用户数
        redisTemplate.opsForValue().increment(currentLoggedUserKey);
    }
@@ -410,10 +413,10 @@
     */
    public void decreOnlineUser(String currentLoggedUserKey) {
        // 检查当前在线用户数
        Integer currentLoggedUser = (Integer)redisTemplate.opsForValue().get(currentLoggedUserKey);
        Object obj = redisTemplate.opsForValue().get(currentLoggedUserKey);

        if (currentLoggedUser != null) {
            Integer currentCount = Integer.parseInt(redisTemplate.opsForValue().get(currentLoggedUserKey)+"");
        if (obj != null) {
            int currentCount = (int)redisTemplate.opsForValue().get(currentLoggedUserKey);
            if(currentCount > 0){
                // 自减在线用户数
                redisTemplate.opsForValue().decrement(currentLoggedUserKey);
@@ -427,6 +430,10 @@
     * @return
     */
    public long getCurrentOnlineUserCount(String currentLoggedUserKey) {
        Object obj = redisTemplate.opsForValue().get(currentLoggedUserKey);
        if(obj == null){
            return 0L;
        }
        return Long.parseLong(redisTemplate.opsForValue().get(currentLoggedUserKey)+"");
    }


 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/UIManagerController.java

@@ -622,18 +622,18 @@
     * @return
     * @throws PLException
     */
/*    @GetMapping( "/getRightListByRoleId")
    @VciBusinessLog(operateName = "根据角色主键获取已授权的UI主键集合")
    public BaseResult getRightListByRoleId(String roleId){
        try {
            return BaseResult.success(uiManagerService.getRightListByRoleId(roleId));
        }catch (Throwable e) {
            e.printStackTrace();
            String exceptionMessage = "获取已授权信息时错误，原因：" + VciBaseUtil.getExceptionMessage(e);
            logger.error(exceptionMessage);
            return BaseResult.fail(exceptionMessage);
        }
    }*/
    /*    @GetMapping( "/getRightListByRoleId")
        @VciBusinessLog(operateName = "根据角色主键获取已授权的UI主键集合")
        public BaseResult getRightListByRoleId(String roleId){
            try {
                return BaseResult.success(uiManagerService.getRightListByRoleId(roleId));
            }catch (Throwable e) {
                e.printStackTrace();
                String exceptionMessage = "获取已授权信息时错误，原因：" + VciBaseUtil.getExceptionMessage(e);
                logger.error(exceptionMessage);
                return BaseResult.fail(exceptionMessage);
            }
        }*/

    /***
     * @param uiAuthorDTO 勾选的需要保存的数据对象

 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPortalVIServiceImpl.java

@@ -166,8 +166,8 @@
        if(PortalVIType.Table.getName()==viType){
            lableName=PortalVIType.Table.getLabel();
        }
        PortalVIVO portalVIVO=new PortalVIVO();
        PortalVI portalVI=  platformClientUtil.getPortalService().getPortalVIById(id);
        PortalVIVO portalVIVO = new PortalVIVO();
        PortalVI portalVI = platformClientUtil.getPortalService().getPortalVIById(id);
        if(portalVI==null||StringUtils.isBlank(portalVI.id)){
            throw new VciBaseException("根据主键未查询到数据");
        }
@@ -1164,10 +1164,12 @@
        List<String> allKeyList= getRefFormVIName(prmItemDO.getItemInObj());
        List<String> itemOutFieldList =VciBaseUtil.str2List(prmItemDO.getItemOutFields());
        List<String> itemKeyFieldList =VciBaseUtil.str2List(prmItemDO.getItemKeyFields());
        List<String> itemSelectOutFieldList= allKeyList.stream().filter(s ->!itemOutFieldList.stream().map(s1 -> s1).collect(Collectors.toList()).contains(s) ).collect(Collectors.toList());
        List<String> itemSelectOutFieldList= allKeyList.stream()
                .filter(s -> !itemOutFieldList.contains(s))
                .collect(Collectors.toList());
        prmItemVO.setItemSelectOutFieldList(itemSelectOutFieldList);//待选择的属性字段
        prmItemVO.setItemOutFieldList(itemOutFieldList);//需要使用的集合
      //  List<String> itemSearchFieldList= itemOutFieldList.stream().filter(s ->!CollectionUtils.isEmpty(itemKeyFieldList).stream().map(s1 -> s1).collect(Collectors.toList()).contains(s) ).collect(Collectors.toList());
        // List<String> itemSearchFieldList= itemOutFieldList.stream().filter(s ->!CollectionUtils.isEmpty(itemKeyFieldList).stream().map(s1 -> s1).collect(Collectors.toList()).contains(s) ).collect(Collectors.toList());
        List<String> itemSearchFieldList=new ArrayList<>();
        if(!CollectionUtils.isEmpty(itemKeyFieldList)){
            itemSearchFieldList= itemOutFieldList.stream().filter(s ->!itemKeyFieldList.contains(s)).collect(Collectors.toList());
@@ -1288,6 +1290,7 @@
        }
        return itemSeniorQueryBOList;
    }

    private List<String> getRefFormVIName(String refFormOid){
        List<String> keyList=new ArrayList<>();
        try {

 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIManagerServiceImpl.java

@@ -39,6 +39,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import javax.swing.tree.TreePath;
import java.io.File;
import java.util.*;
import java.util.concurrent.TimeUnit;
@@ -1700,11 +1701,11 @@
        Map<String,RoleRightVO> roleRightVOMap = new HashMap<>();
        if(StringUtils.isNotBlank(roleId)){
            String userName = WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId();
            RoleRightInfo[] rightInfos= platformClientUtil.getFrameworkService().getRoleRightList(roleId,userName);
            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));
        }
        BizType[] bizTypes=osBtmServiceI.getBizTypes(type);
        BizType[] bizTypes = osBtmServiceI.getBizTypes(type);
        List<Tree> treeList=new ArrayList<>();
        Tree rootNode =new Tree("root","功能模块","root");
        rootNode.setLevel(0);
@@ -1721,9 +1722,8 @@
            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);
            List<PLUILayout> contextList = uiDataFetcher.getContext(bizTypes[i].name/*+context*/);
            //long endTime1 = System.currentTimeMillis();
            //System.out.println("============================================获取UI定义数据引擎耗时："+((endTime1-startTime1)/1000)+"s");

@@ -1774,31 +1774,31 @@
        conditionMap.put("context",uiAuthorDTO.getContext());
        conditionMap.put("showCheckBox","true");
        treeQueryObject.setConditionMap(conditionMap);
        List<Tree> treeList=this.getUIAuthor(treeQueryObject);
        HashMap<String,Tree> allTreeMap=new HashMap<>();
        Map<String,RoleRightDTO> roleRightVOMap=new HashMap<>();
        List<Tree> treeList = this.getUIAuthor(treeQueryObject);
        HashMap<String,Tree> allTreeMap = new HashMap<>();
        Map<String,RoleRightDTO> 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 ->roleRightVOO2DTO(roleRightVO),(oldValue,newValue)->oldValue));
                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();
            List<RoleRightDTO> roleRightDTOList = new ArrayList<>();
            List<Tree> selectTreeList = uiAuthorDTO.getSelectTreeList();
            getSelectedRoleRightObjs(uiAuthorDTO.getRoleId(),selectTreeList,allTreeMap,roleRightVOMap,roleRightDTOList);
            SessionInfo sessionInfo = WebThreadLocalUtil.getCurrentUserSessionInfoInThread();
            String currentUserName = sessionInfo.getUserId();
            boolean isDeveloper= rightControlUtil.isDeveloper(currentUserName);
            List<RoleRightInfo>  roleRightInfoList= roleRightDTOO2InfoS(roleRightDTOList);
            UserEntityInfo info=new UserEntityInfo();
            //boolean isDeveloper = rightControlUtil.isDeveloper(currentUserName);
            List<RoleRightInfo> roleRightInfoList = roleRightDTOO2InfoS(roleRightDTOList);
            UserEntityInfo info = new UserEntityInfo();
            info.modules="UI授权";
            info.userName=currentUserName;
            info.userName = currentUserName;
            try {
             res= platformClientUtil.getFrameworkService().saveRoleRight(roleRightInfoList.toArray(new RoleRightInfo[]{}),uiAuthorDTO.getRoleId(),currentUserName,info);
                res = platformClientUtil.getFrameworkService().saveRoleRight(roleRightInfoList.toArray(new RoleRightInfo[]{}),uiAuthorDTO.getRoleId(),currentUserName,info);
            }catch (PLException e){
                throw  new Exception("保存失败："+e.getMessage());
                throw  new Exception("保存失败：" + e.getMessage());
            }
        }
        return res;
@@ -1811,15 +1811,15 @@
     * @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();
        Map<String,RoleRightDTO> roleRightDTOMap=new HashMap<>();
    private void getSelectedRoleRightObjs(String roleOid, List<Tree> selectTreeList, HashMap<String,Tree> allTreeMap, Map<String,RoleRightDTO> allRoleRightDTOMap, List<RoleRightDTO> roleRightDTOList){
        //Date date=new Date();
        Map<String,RoleRightDTO> roleRightDTOMap = new HashMap<>();
        if(!CollectionUtil.isEmpty(selectTreeList)){
            selectTreeList.stream().forEach(tree -> {
                String oid=tree.getOid();
                String oid = tree.getOid();
                if(allTreeMap.containsKey(oid)){
                    tree=   allTreeMap.get(oid);
                   Object data= tree.getData();
                    tree = allTreeMap.get(oid);
                   Object data = tree.getData();
                    if (data instanceof String) {
                        getRightValue(roleOid, tree, allTreeMap, false, roleRightDTOMap);//向下获取所有模块的权限值
                    } else if (!(data instanceof PLTabButton)) {//业务类型
@@ -1830,16 +1830,17 @@
                        if(allTreeMap.containsKey(parrentId)){
                            SessionInfo sessionInfo = WebThreadLocalUtil.getCurrentUserSessionInfoInThread();
                            String currentUserName = sessionInfo.getUserId();
                            boolean isDeveloper= rightControlUtil.isDeveloper(currentUserName);
                            boolean isDeveloper = rightControlUtil.isDeveloper(currentUserName);
                            Tree parentNode= allTreeMap.get(parrentId);
                            String funcId = parentNode.getOid();
                            getRightValue(roleOid,tree, allTreeMap, true, roleRightDTOMap);//向上处理该操作父级的上级模块权限(不包含父节点)
                            getRightValue(roleOid, tree, allTreeMap, true, roleRightDTOMap);//向上处理该操作父级的上级模块权限(不包含父节点)
                            if(!roleRightDTOMap.containsKey(funcId)){
                                RoleRightDTO roleRightDTO = new RoleRightDTO();
                                roleRightDTO.setId(ObjectUtility.getNewObjectID36());//主键
                                roleRightDTO.setFuncId(funcId);
                                if(isDeveloper) {
                                    roleRightDTO.setRightType((short) 1);//权限类型 权限类型，超级管理员给管理员授权为1，管理员给普通用户授权为2
                                    //权限类型 权限类型，超级管理员给管理员授权为1，管理员给普通用户授权为2
                                    roleRightDTO.setRightType((short) 1);
                                }else{
                                    roleRightDTO.setRightType((short) 2);
                                }
@@ -1863,7 +1864,7 @@
            });
          /*  allRoleRightDTOMap.putAll(roleRightDTOMap.entrySet().stream()
                    .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::  getValue)));*/
         List<RoleRightDTO>    newRoleRightDTOList=Optional.ofNullable(roleRightDTOMap).orElseGet(()->new HashMap<String,RoleRightDTO>()).values().stream().collect(Collectors.toList());
         List<RoleRightDTO> newRoleRightDTOList = Optional.ofNullable(roleRightDTOMap).orElseGet(()->new HashMap<String,RoleRightDTO>()).values().stream().collect(Collectors.toList());
            roleRightDTOList.addAll(newRoleRightDTOList);
        }
    }

 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/utility/UIDataFetcher.java

@@ -49,16 +49,27 @@
            //long e = System.currentTimeMillis();
            //System.out.println(allContext.length + " 1: " + (e - s));
            //s = System.currentTimeMillis();
            List<PLUILayout> contextList = null;
            List<PLUILayout> relatedTypeList = null;
            //List<PLUILayout> contextList = null;
            for (PLUILayout context : allContext) {
                if (contextMap.get(context.plRelatedType) == null) {
                    contextList = new ArrayList<PLUILayout>();
                    contextMap.put(context.plRelatedType, contextList);
                    relatedTypeList = new ArrayList<>();
                    contextMap.put(context.plRelatedType, relatedTypeList);
                } else {
                    contextList = contextMap.get(context.plRelatedType);
                    relatedTypeList = contextMap.get(context.plRelatedType);
                }
                contextList.add(context);
                relatedTypeList.add(context);
                //处理btmName+context方式存的数据
                /*if(contextMap.get(context.plRelatedType + "-" + context.plOId) == null){
                    contextList = new ArrayList<>();
                    contextMap.put(context.plRelatedType + "-" + context.plOId,contextList);
                }else{
                    contextList = contextMap.get(context.plRelatedType + "-" + context.plOId);
                }
                contextList.add(context);*/
            }


            //e = System.currentTimeMillis();
            //System.out.println("2: " + (e - s));
            //初始化所有的页签