Skip to content

Commit d088b32

Browse files
robinhood-jimrobinhood-jim
committed
vue back modify
1 parent 77d20f1 commit d088b32

File tree

9 files changed

+137
-103
lines changed

9 files changed

+137
-103
lines changed

‎core/src/main/resources/core-define.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
VERSION=1.0-SNAPSHOT
1+
VERSION=1.0
22
CREATOR=ROBINJIM

‎etl/src/main/proto/command.proto

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ message TaskResponse {
3030
}
3131
message JobStatusRequest{
3232
string workerName=1;
33-
repeated TaskStatus jobs=2;
33+
repeated TaskStatus tasks=2;
3434
}
3535

3636
message JobStatusResponse{
3737
string workName=1;
38-
repeated TaskStatus jobs=2;
38+
repeated TaskStatus tasks=2;
3939
}
4040
message TaskStatus{
4141
TaskStep taskStep=1;

‎example/base-example/src/main/java/com/robin/basis/dto/SysMenuDTO.java

-42
This file was deleted.

‎example/base-example/src/main/java/com/robin/basis/model/system/SysResource.java

+1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ public class SysResource extends BaseObject {
5252
@MappingField
5353
private String permission;
5454
private Long tenantId;
55+
private String icon;
5556

5657

5758
}

‎example/base-example/src/main/java/com/robin/basis/service/system/SysResourceService.java

+1-50
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package com.robin.basis.service.system;
1717

18-
import com.robin.basis.dto.SysMenuDTO;
1918
import com.robin.basis.model.system.SysResource;
2019
import com.robin.basis.model.user.SysResourceUser;
2120
import com.robin.core.base.exception.ServiceException;
@@ -30,10 +29,7 @@
3029
import org.springframework.transaction.annotation.Transactional;
3130
import org.springframework.util.CollectionUtils;
3231

33-
import java.util.Comparator;
34-
import java.util.HashMap;
35-
import java.util.List;
36-
import java.util.Map;
32+
import java.util.*;
3733
import java.util.function.Function;
3834
import java.util.stream.Collectors;
3935

@@ -124,52 +120,7 @@ public Map<String, Object> getUserRights(Long userId) {
124120
return retMap;
125121
}
126122

127-
public List<SysMenuDTO> getMenuList(Long userId) {
128-
List<SysResource> allList = getAllValidate();
129-
List<SysMenuDTO> dtoList = allList.stream().map(SysMenuDTO::fromVO).collect(Collectors.toList());
130-
Map<Long, SysMenuDTO> dtoMap = dtoList.stream().collect(Collectors.toMap(SysMenuDTO::getId, Function.identity()));
131-
SysMenuDTO root = new SysMenuDTO();
132-
dtoMap.put(0L, root);
133-
Map<Long, Integer> readMap = new HashMap<>();
134123

135-
PageQuery<Map<String, Object>> query1 = new PageQuery();
136-
query1.setPageSize(0);
137-
query1.setSelectParamId("GET_RESOURCEINFO");
138-
query1.addNamedParameter("userId", userId);
139-
jdbcDao.queryBySelectId(query1);
140-
try {
141-
if (!query1.getRecordSet().isEmpty()) {
142-
Map<Long, List<SysMenuDTO>> aMap = query1.getRecordSet().stream().map(SysMenuDTO::fromMap).collect(Collectors.groupingBy(SysMenuDTO::getPid, Collectors.toList()));
143-
144-
List<SysMenuDTO> tops = aMap.get(0L);
145-
tops.sort(Comparator.comparing(SysMenuDTO::getSeqNo));
146-
for (SysMenuDTO dto : tops) {
147-
if (!readMap.containsKey(dto.getId()) && !dto.getAssignType().equals(Const.RESOURCE_ASSIGN_DENIED)) {
148-
dtoMap.get(dto.getPid()).getChildren().add(dtoMap.get(dto.getId()));
149-
doScanChildren(dtoMap, aMap, dto, readMap);
150-
}
151-
readMap.put(dto.getId(), 0);
152-
}
153-
154-
}
155-
} catch (Exception ex) {
156-
ex.printStackTrace();
157-
}
158-
return dtoMap.get(0L).getChildren();
159-
}
160-
161-
private void doScanChildren(Map<Long, SysMenuDTO> cmap, Map<Long, List<SysMenuDTO>> pMap, SysMenuDTO dto, Map<Long, Integer> readMap) {
162-
if (!CollectionUtils.isEmpty(pMap.get(dto.getId()))) {
163-
pMap.get(dto.getId()).sort(Comparator.comparing(SysMenuDTO::getSeqNo));
164-
for (SysMenuDTO childs : pMap.get(dto.getId())) {
165-
if (!readMap.containsKey(childs.getId()) && !childs.getAssignType().equals(Const.RESOURCE_ASSIGN_DENIED)) {
166-
cmap.get(childs.getPid()).getChildren().add(cmap.get(childs.getId()));
167-
doScanChildren(cmap, pMap, childs, readMap);
168-
}
169-
readMap.put(childs.getId(), 0);
170-
}
171-
}
172-
}
173124

174125

175126
}

‎example/boot-example/src/main/resources/queryConfig/query_sys.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
union
9999
select c.*,d.assign_type from t_sys_resource_info c,t_sys_resource_user_r d where c.id=d.res_id and d.USER_ID=:userId and c.STATUS='1' and d.status='1' )e order by res_code,seq_no,assign_type desc
100100
</FROMSQL>
101-
<FIELD>id,res_type as type,res_name as name,url,is_leaf as leafTag,res_code as code,pid,seq_no as seqNo,assign_type as assignType</FIELD>
101+
<FIELD>id,res_type as type,res_name as name,url,is_leaf as leafTag,res_code as code,pid,seq_no as seqNo,assign_type as assignType,is_leaf as leafTag</FIELD>
102102
</SQLSCRIPT>
103103
<SQLSCRIPT ID="GET_RESOURCEINFOBYSYSRESP">
104104
<FROMSQL> from (select a.*,0 as assignType from t_sys_resource_info a,t_sys_resource_resp_r b where a.ID=b.RES_ID and b.RESP_ID in (${respIds}) and a.STATUS='1'

‎vueback/src/main/java/com/robin/basis/controller/user/LoginController.java

+63-7
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717

1818
import cn.hutool.jwt.JWTPayload;
1919
import cn.hutool.jwt.JWTUtil;
20+
import com.robin.basis.dto.LoginUserDTO;
2021
import com.robin.basis.dto.SysMenuDTO;
22+
import com.robin.basis.model.system.SysResource;
2123
import com.robin.basis.sercurity.SysLoginUser;
2224
import com.robin.basis.service.system.SysResourceService;
2325
import com.robin.basis.utils.SecurityUtils;
@@ -26,6 +28,7 @@
2628
import com.robin.core.base.spring.SpringContextHolder;
2729
import com.robin.core.base.util.Const;
2830
import com.robin.core.convert.util.ConvertUtil;
31+
import com.robin.core.query.util.PageQuery;
2932
import com.robin.core.web.controller.AbstractController;
3033
import com.robin.core.web.service.ILoginService;
3134
import com.robin.core.web.util.CookieUtils;
@@ -36,6 +39,7 @@
3639
import org.springframework.security.authentication.AuthenticationManager;
3740
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
3841
import org.springframework.security.core.Authentication;
42+
import org.springframework.util.CollectionUtils;
3943
import org.springframework.util.ObjectUtils;
4044
import org.springframework.web.bind.annotation.GetMapping;
4145
import org.springframework.web.bind.annotation.PostMapping;
@@ -48,10 +52,9 @@
4852
import javax.servlet.http.HttpServletResponse;
4953
import java.time.LocalDateTime;
5054
import java.time.ZoneId;
51-
import java.util.Arrays;
52-
import java.util.HashMap;
53-
import java.util.List;
54-
import java.util.Map;
55+
import java.util.*;
56+
import java.util.function.Function;
57+
import java.util.stream.Collectors;
5558

5659
@RestController
5760
public class LoginController extends AbstractController {
@@ -154,21 +157,74 @@ public boolean validateCaptcha(String code, String uuid) {
154157
public Map<String, Object> getUserInfo(HttpServletRequest request) {
155158
SysLoginUser loginUser= SecurityUtils.getLoginUser();
156159
Map<String, Object> retMap = new HashMap<>();
157-
retMap.put("user", loginUser);
160+
retMap.put("info", LoginUserDTO.fromLoginUsers(loginUser));
158161
retMap.put("roles", loginUser.getRoles());
159-
return retMap;
162+
retMap.put("permission",loginUser.getPermissions());
163+
return wrapObject(retMap);
160164
}
161165

162166
@GetMapping("/getRouters")
163167
public Map<String, Object> getRouter(HttpServletRequest request) {
164168
Map<String, Object> retMap = new HashMap<>();
165169
SysLoginUser loginUser=SecurityUtils.getLoginUser();
166170
if (loginUser != null) {
167-
List<SysMenuDTO> routers = resourceService.getMenuList(loginUser.getId());
171+
List<SysMenuDTO> routers = getMenuList(loginUser.getId());
168172
retMap = wrapObject(routers);
169173
} else {
170174
wrapError(retMap, "not login");
171175
}
172176
return retMap;
173177
}
178+
public List<SysMenuDTO> getMenuList(Long userId) {
179+
List<SysResource> allList = resourceService.getAllValidate();
180+
List<SysMenuDTO> dtoList = allList.stream().map(SysMenuDTO::fromVO).collect(Collectors.toList());
181+
Map<Long, SysMenuDTO> dtoMap = dtoList.stream().collect(Collectors.toMap(SysMenuDTO::getId, Function.identity()));
182+
SysMenuDTO root = new SysMenuDTO();
183+
dtoMap.put(0L, root);
184+
Map<Long, Integer> readMap = new HashMap<>();
185+
186+
PageQuery<Map<String, Object>> query1 = new PageQuery();
187+
query1.setPageSize(0);
188+
query1.setSelectParamId("GET_RESOURCEINFO");
189+
query1.addNamedParameter("userId", userId);
190+
jdbcDao.queryBySelectId(query1);
191+
try {
192+
if (!query1.getRecordSet().isEmpty()) {
193+
Map<Long, List<SysMenuDTO>> aMap = query1.getRecordSet().stream().map(SysMenuDTO::fromMap).collect(Collectors.groupingBy(SysMenuDTO::getPid, Collectors.toList()));
194+
195+
List<SysMenuDTO> tops = aMap.get(0L);
196+
tops.sort(Comparator.comparing(SysMenuDTO::getSeqNo));
197+
for (SysMenuDTO dto : tops) {
198+
if (!readMap.containsKey(dto.getId()) && !dto.getAssignType().equals(Const.RESOURCE_ASSIGN_DENIED)) {
199+
if(dtoMap.get(dto.getPid()).getChildren()==null){
200+
dtoMap.get(dto.getPid()).setChildren(new ArrayList<>());
201+
}
202+
dtoMap.get(dto.getPid()).getChildren().add(dtoMap.get(dto.getId()));
203+
doScanChildren(dtoMap, aMap, dto, readMap);
204+
}
205+
readMap.put(dto.getId(), 0);
206+
}
207+
208+
}
209+
} catch (Exception ex) {
210+
ex.printStackTrace();
211+
}
212+
return dtoMap.get(0L).getChildren();
213+
}
214+
215+
private void doScanChildren(Map<Long, SysMenuDTO> cmap, Map<Long, List<SysMenuDTO>> pMap, SysMenuDTO dto, Map<Long, Integer> readMap) {
216+
if (!CollectionUtils.isEmpty(pMap.get(dto.getId()))) {
217+
pMap.get(dto.getId()).sort(Comparator.comparing(SysMenuDTO::getSeqNo));
218+
for (SysMenuDTO childs : pMap.get(dto.getId())) {
219+
if (!readMap.containsKey(childs.getId()) && !childs.getAssignType().equals(Const.RESOURCE_ASSIGN_DENIED)) {
220+
if(cmap.get(childs.getPid()).getChildren()==null){
221+
cmap.get(childs.getPid()).setChildren(new ArrayList<>());
222+
}
223+
cmap.get(childs.getPid()).getChildren().add(cmap.get(childs.getId()));
224+
doScanChildren(cmap, pMap, childs, readMap);
225+
}
226+
readMap.put(childs.getId(), 0);
227+
}
228+
}
229+
}
174230
}

‎vueback/src/main/java/com/robin/basis/dto/SysMenuDTO.java

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
package com.robin.basis.dto;
2+
3+
import com.fasterxml.jackson.annotation.JsonInclude;
4+
import com.robin.basis.model.system.SysResource;
5+
import com.robin.core.base.util.Const;
6+
import com.robin.core.convert.util.ConvertUtil;
7+
import com.robin.core.web.util.WebConstant;
8+
import lombok.Data;
9+
import org.springframework.beans.BeanUtils;
10+
import org.springframework.util.ObjectUtils;
11+
12+
import java.util.ArrayList;
13+
import java.util.List;
14+
import java.util.Map;
15+
16+
@Data
17+
public class SysMenuDTO {
18+
private Long id;
19+
private String name;
20+
private String path;
21+
private Integer seqNo;
22+
private Long pid;
23+
private boolean hidden=false;
24+
private boolean iframe=false;
25+
private String component="Layout";
26+
private String assignType;
27+
@JsonInclude(JsonInclude.Include.NON_EMPTY)
28+
private List<SysMenuDTO> children;
29+
public static SysMenuDTO fromVO(SysResource source){
30+
SysMenuDTO dto=new SysMenuDTO();
31+
BeanUtils.copyProperties(source,dto);
32+
dto.setAssignType(Const.RESOURCE_ASSIGN_ACCESS);
33+
dto.getMeta().setTitle(source.getName());
34+
dto.getMeta().setIcon(source.getIcon());
35+
dto.setPath(source.getUrl());
36+
if(Const.VALID.equals(source.getLeafTag().toString())){
37+
dto.setComponent(source.getUrl());
38+
}
39+
return dto;
40+
}
41+
public static SysMenuDTO fromMap(Map<String,Object> map){
42+
SysMenuDTO dto=new SysMenuDTO();
43+
try{
44+
ConvertUtil.mapToObject(dto,map);
45+
dto.setAssignType(map.get("assignType").toString());
46+
dto.getMeta().setTitle(map.get("name").toString());
47+
dto.setPath(map.get("url").toString());
48+
if(!ObjectUtils.isEmpty(map.get("icon"))) {
49+
dto.getMeta().setIcon(map.get("icon").toString());
50+
}
51+
if(!Const.VALID.equals(map.get("leafTag").toString())){
52+
dto.setComponent(map.get("url").toString());
53+
}
54+
}catch (Exception ex){
55+
ex.printStackTrace();
56+
}
57+
return dto;
58+
}
59+
private Meta meta=new Meta();
60+
@Data
61+
public static class Meta {
62+
private String title;
63+
64+
private String icon;
65+
}
66+
}

‎vueback/src/main/java/com/robin/basis/sercurity/SysLoginUser.java

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ public class SysLoginUser implements UserDetails {
2323
private String displayName;
2424
private String password;
2525
private String userStatus;
26+
private String avatar;
2627
private SysLoginUser(){
2728

2829
}
@@ -73,6 +74,7 @@ public Builder withSysUser(SysUser user){
7374
loginUser.setDisplayName(user.getUserName());
7475
loginUser.setUserStatus(user.getUserStatus());
7576
loginUser.setPassword(user.getUserPassword());
77+
loginUser.setAvatar(user.getAvatar());
7678
return this;
7779
}
7880
public Builder withRoles(List<Long> roles){

0 commit comments

Comments
 (0)