gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【resource】修复资源接口树渲染中文问题

pull/3/head
fengshuonan 2020-12-21 21:08:54 +08:00
parent a31ad4c6ad
commit f0e49fd03b
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/service/impl/SysResourceServiceImpl.java
View File

@ -92,8 +92,11 @@ public class SysResourceServiceImpl extends ServiceImpl<SysResourceMapper, SysRe
// 2. 按应用和模块编码设置map
Map<String, Map<String, List<ResourceTreeNode>>> appModularResources = divideResources(allResource);
// 3. 根据map组装资源树
return createResourceTree(appModularResources);
// 3. 创建模块code和模块name的映射
Map<String, String> modularCodeName = createModularCodeName(allResource);
// 4. 根据map组装资源树
return createResourceTree(appModularResources, modularCodeName);
}
@Override
@ -275,13 +278,27 @@ public class SysResourceServiceImpl extends ServiceImpl<SysResourceMapper, SysRe
return appModularResources;
}
/**
* 创建模块code和name的映射
*
* @author fengshuonan
* @date 2020/12/21 11:23
*/
private Map<String, String> createModularCodeName(List<SysResource> resources) {
HashMap<String, String> modularCodeName = new HashMap<>();
for (SysResource resource : resources) {
modularCodeName.put(resource.getModularCode(), resource.getModularName());
}
return modularCodeName;
}
/**
* 根据归好类的资源，创建资源树
*
* @author fengshuonan
* @date 2020/12/18 15:45
*/
private List<ResourceTreeNode> createResourceTree(Map<String, Map<String, List<ResourceTreeNode>>> appModularResources) {
private List<ResourceTreeNode> createResourceTree(Map<String, Map<String, List<ResourceTreeNode>>> appModularResources, Map<String, String> modularCodeName) {
List<ResourceTreeNode> finalTree = new ArrayList<>();
@ -300,13 +317,13 @@ public class SysResourceServiceImpl extends ServiceImpl<SysResourceMapper, SysRe
// 创建模块节点
ArrayList<ResourceTreeNode> modularNodes = new ArrayList<>();
for (String modularName : modularResources.keySet()) {
for (String modularCode : modularResources.keySet()) {
ResourceTreeNode modularNode = new ResourceTreeNode();
modularNode.setCode(modularName);
modularNode.setNodeName(modularName);
modularNode.setCode(modularCode);
modularNode.setNodeName(modularCodeName.get(modularCode));
modularNode.setResourceFlag(false);
modularNode.setParentCode(appName);
modularNode.setChildren(modularResources.get(modularName));
modularNode.setChildren(modularResources.get(modularCode));
modularNodes.add(modularNode);
}