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/RoleController.java | 66 +++++---------------------------
1 files changed, 11 insertions(+), 55 deletions(-)
diff --git a/src/main/java/com/whyc/controller/RoleController.java b/src/main/java/com/whyc/controller/RoleController.java
index 00eab1d..86ed7e5 100644
--- a/src/main/java/com/whyc/controller/RoleController.java
+++ b/src/main/java/com/whyc/controller/RoleController.java
@@ -1,5 +1,6 @@
package com.whyc.controller;
+import com.whyc.dto.Response;
import com.whyc.pojo.*;
import com.whyc.service.RoleMenuService;
import com.whyc.service.RolePermissionService;
@@ -20,7 +21,7 @@
@RequestMapping("role")
@RestController
@Slf4j
-@Api(value ="role value",tags = "瑙掕壊鐩稿叧-鐢ㄦ埛,鏉冮檺,鑿滃崟")
+@Api(tags = "瑙掕壊")
public class RoleController {
@Autowired
@@ -35,42 +36,18 @@
@Autowired
private RoleMenuService roleMenuService;
- /**=============鐢ㄦ埛涓庤鑹�================**/
-
- @GetMapping("userWithNoRole")
- @ApiOperation(value = "鏌ヨ鏈垎閰嶈鑹茬殑鐢ㄦ埛")
- public List<User> getUserWithNoRole(){
- return userRoleService.getUserWithNoRole();
- }
-
- @GetMapping("userWithRole")
- @ApiOperation(value = "鏌ヨ鍒嗛厤瑙掕壊鐨勭敤鎴�")
- public List<UserRole> getUserWithRole(){
- return userRoleService.getUserWithRole();
- }
-
- @GetMapping("userWithRoleMap")
- @ApiOperation(value = "鏌ヨ鍒嗛厤瑙掕壊鐨勭敤鎴稭ap")
- public Map<String,List<UserRole>> getUserWithRoleMap(){
- return userRoleService.getUserWithRoleMap();
- }
-
- @GetMapping("roleAll")
+ @GetMapping("all")
@ApiOperation(value = "鏌ヨ鎵�鏈夎鑹�")
- public List<Role> getRoleAll(){
- return roleService.getAll();
+ public Response getRoleAll(){
+ List<Role> roles = roleService.getAll();
+ return new Response().set(1,roles);
}
@PostMapping
@ApiOperation(value = "鏂板瑙掕壊")
- public boolean add(@RequestBody Role role){
- return roleService.add(role);
- }
-
- @PostMapping("batch")
- @ApiOperation(value = "鎵归噺鏂板瑙掕壊")
- public boolean addBatch(@RequestBody List<Role> roles){
- return roleService.addBatch(roles);
+ public Response add(@RequestBody Role role){
+ roleService.add(role);
+ return new Response().setMsg(1,"鏂板鎴愬姛");
}
/**
@@ -95,15 +72,13 @@
/**===============瑙掕壊涓庢潈闄�================**/
- /**
- * TODO 閲囩敤caffeine閲嶅啓
- */
+ /*
@PostMapping("bindingRoleWithPermission")
@ApiOperation(value = "缁戝畾瑙掕壊-鏉冮檺")
@CacheEvict(cacheNames = {"userBridge"},allEntries = true) //鍏ㄩ儴娓呴櫎
public boolean bindingRoleWithPermission(@RequestParam int roleId,int permissionId){
return rolePermissionService.bindingUserWithRole(roleId,permissionId);
- }
+ }*/
/**
* TODO 閲囩敤caffeine閲嶅啓
@@ -114,24 +89,5 @@
public boolean bindingRoleWithPermissionBatch(@RequestBody List<RolePermission> rolePermissions){
return rolePermissionService.bindingUserWithRoleBatch(rolePermissions);
}
-
- @GetMapping("permissions")
- @ApiOperation(value = "鑾峰彇褰撳墠鐢ㄦ埛鐨勬潈闄�")
- public List<Permission> getPermissions(HttpServletRequest request){
- User user = CommonUtil.getUser(request);
- return rolePermissionService.getPermissions(user.getId());
- }
-
- /**==============鐢ㄦ埛-瑙掕壊-鑿滃崟================**/
-
- @GetMapping("userMenu")
- @ApiOperation(value = "鑾峰彇褰撳墠鐢ㄦ埛鐨勮彍鍗�")
- public List<Menu> getUserMenu(HttpServletRequest request){
- User user = CommonUtil.getUser(request);
- return roleMenuService.getUserMenu(user.getId());
- }
-
-
-
}
--
Gitblit v1.9.1