From fcfa92ce6b576aaca5235137fe0ed863df0e62e5 Mon Sep 17 00:00:00 2001
From: whyczh <hzjl@qq.com>
Date: 星期三, 12 五月 2021 14:36:26 +0800
Subject: [PATCH] 用户角色权限接口更新
---
src/main/java/com/whyc/controller/RoleController.java | 58 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 35 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/whyc/controller/RoleController.java b/src/main/java/com/whyc/controller/RoleController.java
index f5ba7eb..a2da792 100644
--- a/src/main/java/com/whyc/controller/RoleController.java
+++ b/src/main/java/com/whyc/controller/RoleController.java
@@ -1,6 +1,7 @@
package com.whyc.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.pagehelper.PageInfo;
import com.whyc.dto.Response;
import com.whyc.pojo.*;
import com.whyc.service.*;
@@ -39,20 +40,20 @@
/**=============鐢ㄦ埛涓庤鑹�================**/
- @GetMapping("userWithNoRole")
- @ApiOperation(value = "鏌ヨ鏈垎閰嶈鑹茬殑鐢ㄦ埛")
+// @GetMapping("userWithNoRole")
+// @ApiOperation(value = "鏌ヨ鏈垎閰嶈鑹茬殑鐢ㄦ埛")
public List<User> getUserWithNoRole(){
return userRoleService.getUserWithNoRole();
}
- @GetMapping("userWithRole")
- @ApiOperation(value = "鏌ヨ鍒嗛厤瑙掕壊鐨勭敤鎴�")
+// @GetMapping("userWithRole")
+// @ApiOperation(value = "鏌ヨ鍒嗛厤瑙掕壊鐨勭敤鎴�")
public List<UserRole> getUserWithRole(){
return userRoleService.getUserWithRole();
}
- @GetMapping("userWithRoleMap")
- @ApiOperation(value = "鏌ヨ鍒嗛厤瑙掕壊鐨勭敤鎴稭ap")
+// @GetMapping("userWithRoleMap")
+// @ApiOperation(value = "鏌ヨ鍒嗛厤瑙掕壊鐨勭敤鎴稭ap")
public Map<String,List<UserRole>> getUserWithRoleMap(){
return userRoleService.getUserWithRoleMap();
}
@@ -65,10 +66,21 @@
@PostMapping("search")
@ApiOperation(value = "鏌ヨ瑙掕壊鍒嗛〉-鏍规嵁绛涢�夋潯浠�")
- public Response<IPage<Role>> getRoleByCondition(@RequestParam int pageNum, @RequestParam int pageSize, @RequestBody Role role){
+ public Response<PageInfo<Role>> getRoleByCondition(@RequestParam int pageNum, @RequestParam int pageSize, @RequestBody Role role){
return roleService.getRoleByCondition(pageNum,pageSize,role);
}
+ @GetMapping("getUserByRoleId")
+ @ApiOperation(value = "閫氳繃瑙掕壊id鑾峰彇鐢ㄦ埛淇℃伅")
+ public Response<PageInfo<User>> getUserByRoleId(@RequestParam int roleId){
+ return roleService.getUserByRoleId(roleId);
+ }
+
+ @PutMapping("updateRoleState")
+ @ApiOperation(value = "鍚敤/鍐荤粨瑙掕壊")
+ public Response updateRoleState(@RequestParam int roleId,@RequestParam int state){
+ return roleService.updateRoleState(roleId,state);
+ }
@PostMapping
@@ -77,22 +89,22 @@
return roleService.add(role);
}
- @PostMapping("batch")
- @ApiOperation(value = "鎵归噺鏂板瑙掕壊")
+// @PostMapping("batch")
+// @ApiOperation(value = "鎵归噺鏂板瑙掕壊")
public boolean addBatch(@RequestBody List<Role> roles){
return roleService.addBatch(roles);
}
- @PostMapping("bindingUserWithRole")
- @ApiOperation(value = "缁戝畾鐢ㄦ埛鍜岃鑹�")
- @CacheEvict(cacheNames = {"userBridge"},key="'getAuthorizationInfo'+#p0") //娓呴櫎
+// @PostMapping("bindingUserWithRole")
+// @ApiOperation(value = "缁戝畾鐢ㄦ埛鍜岃鑹�")
+// @CacheEvict(cacheNames = {"userBridge"},key="'getAuthorizationInfo'+#p0") //娓呴櫎
public boolean bindingUserWithRole(@RequestParam int userId,int roleId){
return userRoleService.bindingUserWithRole(userId,roleId);
}
- @PostMapping("bindingUserWithRoleBatch")
- @ApiOperation(value = "鎵归噺缁戝畾鐢ㄦ埛鍜岃鑹�",notes = "浼犲叆userId鍜宺oleId鐨勬暟缁�")
- @CacheEvict(cacheNames = {"userBridge"},allEntries = true) //鍏ㄩ儴娓呴櫎
+// @PostMapping("bindingUserWithRoleBatch")
+// @ApiOperation(value = "鎵归噺缁戝畾鐢ㄦ埛鍜岃鑹�",notes = "浼犲叆userId鍜宺oleId鐨勬暟缁�")
+// @CacheEvict(cacheNames = {"userBridge"},allEntries = true) //鍏ㄩ儴娓呴櫎
public boolean bindingUserWithRoleBatch(@RequestBody List<UserRole> userRoles){
return userRoleService.bindingUserWithRoleBatch(userRoles);
}
@@ -105,16 +117,16 @@
return permissionService.getAll();
}
- @PostMapping("bindingRoleWithPermission")
- @ApiOperation(value = "缁戝畾瑙掕壊-鏉冮檺")
- @CacheEvict(cacheNames = {"userBridge"},allEntries = true) //鍏ㄩ儴娓呴櫎
+// @PostMapping("bindingRoleWithPermission")
+// @ApiOperation(value = "缁戝畾瑙掕壊-鏉冮檺")
+// @CacheEvict(cacheNames = {"userBridge"},allEntries = true) //鍏ㄩ儴娓呴櫎
public boolean bindingRoleWithPermission(@RequestParam int roleId,int permissionId){
return rolePermissionService.bindingUserWithRole(roleId,permissionId);
}
- @PostMapping("bindingRoleWithPermissionBatch")
- @ApiOperation(value = "鎵归噺缁戝畾瑙掕壊-鏉冮檺",notes = "浼犲叆roleId鍜宲rivilegeId鐨勬暟缁�")
- @CacheEvict(cacheNames = {"userBridge"},allEntries = true) //鍏ㄩ儴娓呴櫎
+// @PostMapping("bindingRoleWithPermissionBatch")
+// @ApiOperation(value = "鎵归噺缁戝畾瑙掕壊-鏉冮檺",notes = "浼犲叆roleId鍜宲rivilegeId鐨勬暟缁�")
+// @CacheEvict(cacheNames = {"userBridge"},allEntries = true) //鍏ㄩ儴娓呴櫎
public boolean bindingRoleWithPermissionBatch(@RequestBody List<RolePermission> rolePermissions){
return rolePermissionService.bindingUserWithRoleBatch(rolePermissions);
}
@@ -129,8 +141,8 @@
/**==============鐢ㄦ埛-瑙掕壊-鑿滃崟================**/
- @GetMapping("allMenus")
- @ApiOperation(value = "鑾峰彇鎵�鏈夎彍鍗�")
+// @GetMapping("allMenus")
+// @ApiOperation(value = "鑾峰彇鎵�鏈夎彍鍗�")
public List<Menu> getAllMenu(){
return roleMenuService.getAllMenus();
}
--
Gitblit v1.9.1