|
|
@@ -3,7 +3,7 @@ package cn.reghao.bnt.web.admin.controller;
|
|
|
import cn.reghao.bnt.web.admin.model.po.Menu;
|
|
|
import cn.reghao.bnt.web.admin.model.po.Role;
|
|
|
import cn.reghao.bnt.web.admin.model.po.User;
|
|
|
-import cn.reghao.bnt.web.admin.model.vo.MenuTree;
|
|
|
+import cn.reghao.bnt.web.admin.model.vo.ResourceTree;
|
|
|
import cn.reghao.bnt.web.admin.model.vo.RoleVO;
|
|
|
import cn.reghao.bnt.web.admin.service.AccountService;
|
|
|
import cn.reghao.bnt.web.admin.service.MenuService;
|
|
|
@@ -14,9 +14,8 @@ import io.swagger.v3.oas.annotations.Operation;
|
|
|
import org.springframework.http.MediaType;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
-import java.util.Collections;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Set;
|
|
|
+import java.util.*;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* @author reghao
|
|
|
@@ -54,8 +53,13 @@ public class RoleController {
|
|
|
@GetMapping(value = "/menus", produces = MediaType.APPLICATION_JSON_VALUE)
|
|
|
@ResponseBody
|
|
|
public String getRoleMenus(@RequestParam("id") Role role) {
|
|
|
- List<MenuTree> allMenus = menuService.getMenuTreeByRole(role);
|
|
|
- return WebResult.success(allMenus);
|
|
|
+ List<Integer> roleMenuIds = role.getMenus().stream().map(Menu::getId).collect(Collectors.toList());
|
|
|
+ List<ResourceTree> allMenus = menuService.getMenuTreeByRole1(role);
|
|
|
+
|
|
|
+ Map<String, Object> map = new HashMap<>();
|
|
|
+ map.put("roleMenuIds", roleMenuIds);
|
|
|
+ map.put("allMenus", allMenus);
|
|
|
+ return WebResult.success(map);
|
|
|
}
|
|
|
|
|
|
@Operation(summary = "设置角色可访问的资源", description = "N")
|
