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
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPortalVIServiceImpl.java
@@ -1164,7 +1164,9 @@ 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()); @@ -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; @@ -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"); @@ -1790,7 +1790,7 @@ getSelectedRoleRightObjs(uiAuthorDTO.getRoleId(),selectTreeList,allTreeMap,roleRightVOMap,roleRightDTOList); SessionInfo sessionInfo = WebThreadLocalUtil.getCurrentUserSessionInfoInThread(); String currentUserName = sessionInfo.getUserId(); boolean isDeveloper= rightControlUtil.isDeveloper(currentUserName); //boolean isDeveloper = rightControlUtil.isDeveloper(currentUserName); List<RoleRightInfo> roleRightInfoList= roleRightDTOO2InfoS(roleRightDTOList); UserEntityInfo info=new UserEntityInfo(); info.modules="UI授权"; @@ -1812,7 +1812,7 @@ * @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(); //Date date=new Date(); Map<String,RoleRightDTO> roleRightDTOMap=new HashMap<>(); if(!CollectionUtil.isEmpty(selectTreeList)){ selectTreeList.stream().forEach(tree -> { @@ -1839,7 +1839,8 @@ 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); } 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)); //初始化所有的页签