Skip to content

Commit 8e52644

Browse files
robinhood-jimrobinhood-jim
committed
vue sample update
1 parent d088b32 commit 8e52644

File tree

7 files changed

+141
-22
lines changed

7 files changed

+141
-22
lines changed

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

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
package com.robin.basis.dto;
2+
3+
import com.robin.basis.model.system.SysResource;
4+
import com.robin.core.convert.util.ConvertUtil;
5+
import lombok.Data;
6+
import org.springframework.beans.BeanUtils;
7+
8+
import java.util.ArrayList;
9+
import java.util.List;
10+
import java.util.Map;
11+
12+
@Data
13+
public class SysMenuDTO {
14+
private Long id;
15+
private String type;
16+
private String title;
17+
private String path;
18+
private Integer seqNo;
19+
private Long pid;
20+
private Integer leafTag;
21+
private String assignType;
22+
private List<SysMenuDTO> children=new ArrayList<>();
23+
public static SysMenuDTO fromVO(SysResource source){
24+
SysMenuDTO dto=new SysMenuDTO();
25+
BeanUtils.copyProperties(source,dto);
26+
dto.setTitle(source.getName());
27+
dto.setPath(source.getUrl());
28+
return dto;
29+
}
30+
public static SysMenuDTO fromMap(Map<String,Object> map){
31+
SysMenuDTO dto=new SysMenuDTO();
32+
try{
33+
ConvertUtil.mapToObject(dto,map);
34+
dto.setAssignType(map.get("assignType").toString());
35+
dto.setTitle(map.get("name").toString());
36+
dto.setPath(map.get("url").toString());
37+
}catch (Exception ex){
38+
ex.printStackTrace();
39+
}
40+
return dto;
41+
}
42+
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@ public class SysResource extends BaseObject {
5353
private String permission;
5454
private Long tenantId;
5555
private String icon;
56-
56+
private String routePath;
5757

5858
}

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

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

18+
import com.robin.basis.dto.SysMenuDTO;
1819
import com.robin.basis.model.system.SysResource;
1920
import com.robin.basis.model.user.SysResourceUser;
2021
import com.robin.core.base.exception.ServiceException;
@@ -119,7 +120,52 @@ public Map<String, Object> getUserRights(Long userId) {
119120
}
120121
return retMap;
121122
}
123+
public List<SysMenuDTO> getMenuList(Long userId) {
124+
List<SysResource> allList = getAllValidate();
125+
List<SysMenuDTO> dtoList = allList.stream().map(SysMenuDTO::fromVO).collect(Collectors.toList());
126+
Map<Long, SysMenuDTO> dtoMap = dtoList.stream().collect(Collectors.toMap(SysMenuDTO::getId, Function.identity()));
127+
SysMenuDTO root = new SysMenuDTO();
128+
dtoMap.put(0L, root);
129+
Map<Long, Integer> readMap = new HashMap<>();
122130

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

124170

125171

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

+13-13
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import cn.hutool.jwt.JWTPayload;
1919
import cn.hutool.jwt.JWTUtil;
2020
import com.robin.basis.dto.LoginUserDTO;
21-
import com.robin.basis.dto.SysMenuDTO;
21+
import com.robin.basis.dto.RouterDTO;
2222
import com.robin.basis.model.system.SysResource;
2323
import com.robin.basis.sercurity.SysLoginUser;
2424
import com.robin.basis.service.system.SysResourceService;
@@ -168,18 +168,18 @@ public Map<String, Object> getRouter(HttpServletRequest request) {
168168
Map<String, Object> retMap = new HashMap<>();
169169
SysLoginUser loginUser=SecurityUtils.getLoginUser();
170170
if (loginUser != null) {
171-
List<SysMenuDTO> routers = getMenuList(loginUser.getId());
171+
List<RouterDTO> routers = getMenuList(loginUser.getId());
172172
retMap = wrapObject(routers);
173173
} else {
174174
wrapError(retMap, "not login");
175175
}
176176
return retMap;
177177
}
178-
public List<SysMenuDTO> getMenuList(Long userId) {
178+
public List<RouterDTO> getMenuList(Long userId) {
179179
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();
180+
List<RouterDTO> dtoList = allList.stream().map(RouterDTO::fromVO).collect(Collectors.toList());
181+
Map<Long, RouterDTO> dtoMap = dtoList.stream().collect(Collectors.toMap(RouterDTO::getId, Function.identity()));
182+
RouterDTO root = new RouterDTO();
183183
dtoMap.put(0L, root);
184184
Map<Long, Integer> readMap = new HashMap<>();
185185

@@ -190,11 +190,11 @@ public List<SysMenuDTO> getMenuList(Long userId) {
190190
jdbcDao.queryBySelectId(query1);
191191
try {
192192
if (!query1.getRecordSet().isEmpty()) {
193-
Map<Long, List<SysMenuDTO>> aMap = query1.getRecordSet().stream().map(SysMenuDTO::fromMap).collect(Collectors.groupingBy(SysMenuDTO::getPid, Collectors.toList()));
193+
Map<Long, List<RouterDTO>> aMap = query1.getRecordSet().stream().map(RouterDTO::fromMap).collect(Collectors.groupingBy(RouterDTO::getPid, Collectors.toList()));
194194

195-
List<SysMenuDTO> tops = aMap.get(0L);
196-
tops.sort(Comparator.comparing(SysMenuDTO::getSeqNo));
197-
for (SysMenuDTO dto : tops) {
195+
List<RouterDTO> tops = aMap.get(0L);
196+
tops.sort(Comparator.comparing(RouterDTO::getSeqNo));
197+
for (RouterDTO dto : tops) {
198198
if (!readMap.containsKey(dto.getId()) && !dto.getAssignType().equals(Const.RESOURCE_ASSIGN_DENIED)) {
199199
if(dtoMap.get(dto.getPid()).getChildren()==null){
200200
dtoMap.get(dto.getPid()).setChildren(new ArrayList<>());
@@ -212,10 +212,10 @@ public List<SysMenuDTO> getMenuList(Long userId) {
212212
return dtoMap.get(0L).getChildren();
213213
}
214214

215-
private void doScanChildren(Map<Long, SysMenuDTO> cmap, Map<Long, List<SysMenuDTO>> pMap, SysMenuDTO dto, Map<Long, Integer> readMap) {
215+
private void doScanChildren(Map<Long, RouterDTO> cmap, Map<Long, List<RouterDTO>> pMap, RouterDTO dto, Map<Long, Integer> readMap) {
216216
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())) {
217+
pMap.get(dto.getId()).sort(Comparator.comparing(RouterDTO::getSeqNo));
218+
for (RouterDTO childs : pMap.get(dto.getId())) {
219219
if (!readMap.containsKey(childs.getId()) && !childs.getAssignType().equals(Const.RESOURCE_ASSIGN_DENIED)) {
220220
if(cmap.get(childs.getPid()).getChildren()==null){
221221
cmap.get(childs.getPid()).setChildren(new ArrayList<>());

Diff for: ‎vueback/src/main/java/com/robin/basis/dto/LoginUserDTO.java

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package com.robin.basis.dto;
2+
3+
import com.robin.basis.sercurity.SysLoginUser;
4+
import lombok.Data;
5+
6+
import java.io.Serializable;
7+
8+
@Data
9+
public class LoginUserDTO implements Serializable {
10+
private String id;
11+
private String username;
12+
private String nickname;
13+
private String avatar;
14+
private String email;
15+
private String phone;
16+
private Long tenantId;
17+
public static LoginUserDTO fromLoginUsers(SysLoginUser loginUser){
18+
LoginUserDTO dto=new LoginUserDTO();
19+
dto.setId(loginUser.getId().toString());
20+
dto.setUsername(loginUser.getUsername());
21+
dto.setNickname(loginUser.getDisplayName());
22+
dto.setAvatar(loginUser.getAvatar());
23+
dto.setEmail(loginUser.getEmail());
24+
dto.setPhone(loginUser.getPhone());
25+
return dto;
26+
}
27+
28+
29+
}

Diff for: ‎vueback/src/main/java/com/robin/basis/dto/SysMenuDTO.java renamed to ‎vueback/src/main/java/com/robin/basis/dto/RouterDTO.java

+6-8
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,15 @@
44
import com.robin.basis.model.system.SysResource;
55
import com.robin.core.base.util.Const;
66
import com.robin.core.convert.util.ConvertUtil;
7-
import com.robin.core.web.util.WebConstant;
87
import lombok.Data;
98
import org.springframework.beans.BeanUtils;
109
import org.springframework.util.ObjectUtils;
1110

12-
import java.util.ArrayList;
1311
import java.util.List;
1412
import java.util.Map;
1513

1614
@Data
17-
public class SysMenuDTO {
15+
public class RouterDTO {
1816
private Long id;
1917
private String name;
2018
private String path;
@@ -25,9 +23,9 @@ public class SysMenuDTO {
2523
private String component="Layout";
2624
private String assignType;
2725
@JsonInclude(JsonInclude.Include.NON_EMPTY)
28-
private List<SysMenuDTO> children;
29-
public static SysMenuDTO fromVO(SysResource source){
30-
SysMenuDTO dto=new SysMenuDTO();
26+
private List<RouterDTO> children;
27+
public static RouterDTO fromVO(SysResource source){
28+
RouterDTO dto=new RouterDTO();
3129
BeanUtils.copyProperties(source,dto);
3230
dto.setAssignType(Const.RESOURCE_ASSIGN_ACCESS);
3331
dto.getMeta().setTitle(source.getName());
@@ -38,8 +36,8 @@ public static SysMenuDTO fromVO(SysResource source){
3836
}
3937
return dto;
4038
}
41-
public static SysMenuDTO fromMap(Map<String,Object> map){
42-
SysMenuDTO dto=new SysMenuDTO();
39+
public static RouterDTO fromMap(Map<String,Object> map){
40+
RouterDTO dto=new RouterDTO();
4341
try{
4442
ConvertUtil.mapToObject(dto,map);
4543
dto.setAssignType(map.get("assignType").toString());

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

+4
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ public class SysLoginUser implements UserDetails {
2424
private String password;
2525
private String userStatus;
2626
private String avatar;
27+
private String phone;
28+
private String email;
2729
private SysLoginUser(){
2830

2931
}
@@ -75,6 +77,8 @@ public Builder withSysUser(SysUser user){
7577
loginUser.setUserStatus(user.getUserStatus());
7678
loginUser.setPassword(user.getUserPassword());
7779
loginUser.setAvatar(user.getAvatar());
80+
loginUser.setEmail(user.getEmail());
81+
loginUser.setPhone(user.getPhoneNum());
7882
return this;
7983
}
8084
public Builder withRoles(List<Long> roles){

0 commit comments

Comments
 (0)