From 7d64716cb0d406f21cde03976fd273bd07fdc06f Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期二, 28 九月 2021 11:44:28 +0800
Subject: [PATCH] 更新用户-角色-菜单-权限
---
src/main/java/com/whyc/controller/RoleMenuController.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/whyc/controller/RoleMenuController.java b/src/main/java/com/whyc/controller/RoleMenuController.java
index 57586b6..e54d532 100644
--- a/src/main/java/com/whyc/controller/RoleMenuController.java
+++ b/src/main/java/com/whyc/controller/RoleMenuController.java
@@ -3,7 +3,9 @@
import com.whyc.dto.Response;
import com.whyc.pojo.Menu;
import com.whyc.pojo.RoleMenu;
+import com.whyc.pojo.User;
import com.whyc.service.RoleMenuService;
+import com.whyc.util.CommonUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.GetMapping;
@@ -12,6 +14,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
@@ -23,7 +26,7 @@
*/
@RequestMapping("roleMenu")
@RestController
-@Api(tags = "瑙掕壊鑿滃崟")
+@Api(tags = "瑙掕壊-鑿滃崟")
public class RoleMenuController {
@Resource
@@ -32,13 +35,24 @@
@GetMapping("menuByRoleId")
@ApiOperation(value = "鏌ヨ瑙掕壊瀵瑰簲鐨勮彍鍗�")
public Response getMenuByRoleId(@RequestParam Integer roleId){
- List<Menu> roleMenus = service.getMenuByRoleId(roleId);
+ List<Menu> roleMenus = service.getMenuByRoleId(roleId,1);
return new Response().set(1,roleMenus);
}
- public Response getMenu(@RequestParam Integer roleId){
- List<Menu> roleMenus = service.getMenuByRoleId(roleId);
+ @GetMapping("allMenuByRoleId")
+ @ApiOperation(value = "鏌ヨ瑙掕壊瀵瑰簲鎵�鏈夌姸鎬佺殑鑿滃崟")
+ public Response getAllMenuByRoleId(@RequestParam Integer roleId){
+ List<Menu> roleMenus = service.getMenuByRoleId(roleId,null);
+
+ return new Response().set(1,roleMenus);
+ }
+
+ @GetMapping("currentUserMenu")
+ @ApiOperation(value = "鑾峰彇褰撳墠鐢ㄦ埛鐨勮彍鍗�")
+ public Response getCurrentUserMenu(HttpServletRequest request){
+ Integer roleId = CommonUtil.getUser(request).getRoleId();
+ List<Menu> roleMenus = service.getMenuByRoleId(roleId,1);
return new Response().set(1,roleMenus);
}
--
Gitblit v1.9.1