|
@@ -11,7 +11,9 @@ import org.jeecg.modules.jmreport.ext.service.ExtPageConfigService; |
|
@@ -11,7 +11,9 @@ import org.jeecg.modules.jmreport.ext.service.ExtPageConfigService; |
|
11
|
import org.springframework.stereotype.Service;
|
11
|
import org.springframework.stereotype.Service;
|
|
12
|
|
12
|
|
|
13
|
import java.util.ArrayList;
|
13
|
import java.util.ArrayList;
|
|
|
|
14
|
+import java.util.HashMap;
|
|
14
|
import java.util.List;
|
15
|
import java.util.List;
|
|
|
|
16
|
+import java.util.Map;
|
|
15
|
import java.util.stream.Collectors;
|
17
|
import java.util.stream.Collectors;
|
|
16
|
|
18
|
|
|
17
|
/**
|
19
|
/**
|
|
@@ -31,7 +33,7 @@ public class ExtPageConfigServiceImpl extends ServiceImpl<ExtPageConfigDao, ExtP |
|
@@ -31,7 +33,7 @@ public class ExtPageConfigServiceImpl extends ServiceImpl<ExtPageConfigDao, ExtP |
|
31
|
@Override
|
33
|
@Override
|
|
32
|
public PageTreeNode getTree() {
|
34
|
public PageTreeNode getTree() {
|
|
33
|
|
35
|
|
|
34
|
- PageTreeNode root = new PageTreeNode(-1,"页面配置");
|
36
|
+ PageTreeNode root = new PageTreeNode(-1, "页面配置");
|
|
35
|
|
37
|
|
|
36
|
LambdaQueryWrapper<ExtPageConfig> queryWrapper = new LambdaQueryWrapper<>();
|
38
|
LambdaQueryWrapper<ExtPageConfig> queryWrapper = new LambdaQueryWrapper<>();
|
|
37
|
queryWrapper.orderByAsc(ExtPageConfig::getSort);
|
39
|
queryWrapper.orderByAsc(ExtPageConfig::getSort);
|
|
@@ -40,11 +42,11 @@ public class ExtPageConfigServiceImpl extends ServiceImpl<ExtPageConfigDao, ExtP |
|
@@ -40,11 +42,11 @@ public class ExtPageConfigServiceImpl extends ServiceImpl<ExtPageConfigDao, ExtP |
|
40
|
// 获取所有父节点
|
42
|
// 获取所有父节点
|
|
41
|
List<ExtPageConfig> parentList = list.stream().filter(item -> item.getParentId() == null).collect(Collectors.toList());
|
43
|
List<ExtPageConfig> parentList = list.stream().filter(item -> item.getParentId() == null).collect(Collectors.toList());
|
|
42
|
|
44
|
|
|
43
|
- parentList.stream().forEach(item ->{
|
45
|
+ parentList.stream().forEach(item -> {
|
|
44
|
|
46
|
|
|
45
|
- PageTreeNode node = new PageTreeNode(item.getId(),item.getPageName());
|
|
|
|
46
|
- node.getProps().put("reportCode",item.getReportCode());
|
|
|
|
47
|
- getChild(node,list,item);
|
47
|
+ PageTreeNode node = new PageTreeNode(item.getId(), item.getPageName());
|
|
|
|
48
|
+ node.getProps().put("reportCode", item.getReportCode());
|
|
|
|
49
|
+ getChild(node, list, item);
|
|
48
|
root.getChildren().add(node);
|
50
|
root.getChildren().add(node);
|
|
49
|
});
|
51
|
});
|
|
50
|
|
52
|
|
|
@@ -58,67 +60,72 @@ public class ExtPageConfigServiceImpl extends ServiceImpl<ExtPageConfigDao, ExtP |
|
@@ -58,67 +60,72 @@ public class ExtPageConfigServiceImpl extends ServiceImpl<ExtPageConfigDao, ExtP |
|
58
|
* @return
|
60
|
* @return
|
|
59
|
*/
|
61
|
*/
|
|
60
|
@Override
|
62
|
@Override
|
|
61
|
- public PageDetail getPageDetail(String pageCode) {
|
|
|
|
62
|
- if(StringUtils.isBlank(pageCode)){
|
|
|
|
63
|
- return null;
|
63
|
+ public Map<String, Object> getPageDetail(String pageCode) {
|
|
|
|
64
|
+ Map<String, Object> maps = new HashMap<>();
|
|
|
|
65
|
+ if (StringUtils.isBlank(pageCode)) {
|
|
|
|
66
|
+ return maps;
|
|
64
|
}
|
67
|
}
|
|
65
|
|
68
|
|
|
66
|
-
|
69
|
+ Map<String, String> codeMap = new HashMap<>();
|
|
67
|
LambdaQueryWrapper<ExtPageConfig> queryWrapper = new LambdaQueryWrapper<>();
|
70
|
LambdaQueryWrapper<ExtPageConfig> queryWrapper = new LambdaQueryWrapper<>();
|
|
68
|
- queryWrapper.eq(ExtPageConfig::getPageCode,pageCode);
|
71
|
+ queryWrapper.eq(ExtPageConfig::getPageCode, pageCode);
|
|
69
|
|
72
|
|
|
70
|
ExtPageConfig one = this.getOne(queryWrapper);
|
73
|
ExtPageConfig one = this.getOne(queryWrapper);
|
|
71
|
- if(one == null){
|
74
|
+ if (one == null) {
|
|
72
|
return null;
|
75
|
return null;
|
|
73
|
}
|
76
|
}
|
|
74
|
|
77
|
|
|
75
|
// 获取子菜单
|
78
|
// 获取子菜单
|
|
76
|
- PageDetail root = PageDetail.builder()
|
|
|
|
77
|
- .pageCode(one.getPageCode())
|
|
|
|
78
|
- .pageName(one.getPageName())
|
|
|
|
79
|
- .reportCode(one.getReportCode())
|
|
|
|
80
|
- .child(new ArrayList<>())
|
|
|
|
81
|
- .build();
|
79
|
+ PageDetail root = PageDetail.builder().pageCode(one.getPageCode()).pageName(one.getPageName()).reportCode(one.getReportCode()).child(new ArrayList<>()).build();
|
|
|
|
80
|
+
|
|
|
|
81
|
+
|
|
82
|
|
82
|
|
|
83
|
Integer id = one.getId();
|
83
|
Integer id = one.getId();
|
|
84
|
- getPageNode(id,root);
|
84
|
+ getPageNode(id, root, codeMap);
|
|
85
|
|
85
|
|
|
86
|
- return root;
|
86
|
+ maps.put("root", root);
|
|
|
|
87
|
+ maps.put("codeMaps", codeMap);
|
|
|
|
88
|
+ return maps;
|
|
87
|
}
|
89
|
}
|
|
88
|
|
90
|
|
|
89
|
|
91
|
|
|
90
|
- private void getPageNode( Integer id ,PageDetail root){
|
92
|
+ private void getPageNode(Integer id, PageDetail root, Map<String, String> codeMap) {
|
|
|
|
93
|
+
|
|
|
|
94
|
+ setMapData(root, codeMap);
|
|
91
|
LambdaQueryWrapper<ExtPageConfig> queryWrapper1 = new LambdaQueryWrapper<>();
|
95
|
LambdaQueryWrapper<ExtPageConfig> queryWrapper1 = new LambdaQueryWrapper<>();
|
|
92
|
- queryWrapper1.eq(ExtPageConfig::getParentId,id);
|
96
|
+ queryWrapper1.eq(ExtPageConfig::getParentId, id);
|
|
93
|
queryWrapper1.orderByAsc(ExtPageConfig::getSort);
|
97
|
queryWrapper1.orderByAsc(ExtPageConfig::getSort);
|
|
94
|
List<ExtPageConfig> list = this.list(queryWrapper1);
|
98
|
List<ExtPageConfig> list = this.list(queryWrapper1);
|
|
95
|
- if(list == null || list.isEmpty()){
|
99
|
+ if (list == null || list.isEmpty()) {
|
|
96
|
return;
|
100
|
return;
|
|
97
|
}
|
101
|
}
|
|
98
|
- list.stream().forEach(item ->{
|
|
|
|
99
|
- PageDetail child = PageDetail.builder()
|
|
|
|
100
|
- .pageCode(item.getPageCode())
|
|
|
|
101
|
- .pageName(item.getPageName())
|
|
|
|
102
|
- .reportCode(item.getReportCode())
|
|
|
|
103
|
- .child(new ArrayList<>())
|
|
|
|
104
|
- .build();
|
|
|
|
105
|
-
|
|
|
|
106
|
- getPageNode(item.getId(), child);
|
102
|
+ list.stream().forEach(item -> {
|
|
|
|
103
|
+ PageDetail child = PageDetail.builder().pageCode(item.getPageCode()).pageName(item.getPageName()).reportCode(item.getReportCode()).child(new ArrayList<>()).build();
|
|
|
|
104
|
+ setMapData(child, codeMap);
|
|
|
|
105
|
+ getPageNode(item.getId(), child, codeMap);
|
|
107
|
|
106
|
|
|
108
|
root.getChild().add(child);
|
107
|
root.getChild().add(child);
|
|
109
|
});
|
108
|
});
|
|
110
|
}
|
109
|
}
|
|
111
|
|
110
|
|
|
|
|
111
|
+ private void setMapData(PageDetail root, Map<String, String> codeMap){
|
|
|
|
112
|
+ String pageCode = root.getPageCode();
|
|
|
|
113
|
+ String reportCode = root.getReportCode();
|
|
|
|
114
|
+ if(StringUtils.isNotBlank(pageCode) && StringUtils.isNotBlank(reportCode)){
|
|
|
|
115
|
+ codeMap.put(pageCode, reportCode);
|
|
|
|
116
|
+ }
|
|
|
|
117
|
+ }
|
|
|
|
118
|
+
|
|
112
|
|
119
|
|
|
113
|
- private void getChild(PageTreeNode root,List<ExtPageConfig> list,ExtPageConfig pageConfig){
|
120
|
+ private void getChild(PageTreeNode root, List<ExtPageConfig> list, ExtPageConfig pageConfig) {
|
|
114
|
|
121
|
|
|
115
|
// 获取子节点
|
122
|
// 获取子节点
|
|
116
|
List<ExtPageConfig> childList = list.stream().filter(item -> item.getParentId() == root.getId()).collect(Collectors.toList());
|
123
|
List<ExtPageConfig> childList = list.stream().filter(item -> item.getParentId() == root.getId()).collect(Collectors.toList());
|
|
117
|
|
124
|
|
|
118
|
- if(!childList.isEmpty()){
|
|
|
|
119
|
- childList.stream().forEach(item ->{
|
|
|
|
120
|
- PageTreeNode node = new PageTreeNode(item.getId(),item.getPageName());
|
|
|
|
121
|
- node.getProps().put("reportCode",item.getReportCode());
|
125
|
+ if (!childList.isEmpty()) {
|
|
|
|
126
|
+ childList.stream().forEach(item -> {
|
|
|
|
127
|
+ PageTreeNode node = new PageTreeNode(item.getId(), item.getPageName());
|
|
|
|
128
|
+ node.getProps().put("reportCode", item.getReportCode());
|
|
122
|
root.getChildren().add(node);
|
129
|
root.getChildren().add(node);
|
|
123
|
});
|
130
|
});
|
|
124
|
}
|
131
|
}
|
