From 8c189b243bfbbacb2ab1ce79f4e1ff22708f125a Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期一, 26 七月 2021 16:45:09 +0800
Subject: [PATCH] 修复接口
---
src/main/java/com/whyc/controller/RoleController.java | 148 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 116 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/whyc/controller/RoleController.java b/src/main/java/com/whyc/controller/RoleController.java
index 2794ec5..fca64d2 100644
--- a/src/main/java/com/whyc/controller/RoleController.java
+++ b/src/main/java/com/whyc/controller/RoleController.java
@@ -1,15 +1,17 @@
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.RoleMenuService;
-import com.whyc.service.RolePermissionService;
-import com.whyc.service.RoleService;
-import com.whyc.service.UserRoleService;
+import com.whyc.service.*;
import com.whyc.util.CommonUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
@@ -33,23 +35,25 @@
@Autowired
private RoleMenuService roleMenuService;
+ @Autowired
+ private PermissionService permissionService;
/**=============鐢ㄦ埛涓庤鑹�================**/
- @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();
}
@@ -60,57 +64,137 @@
return roleService.getAll();
}
+ @PostMapping("search")
+ @ApiOperation(value = "鏌ヨ瑙掕壊鍒嗛〉-鏍规嵁绛涢�夋潯浠�")
+ 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鑾峰彇鐢ㄦ埛淇℃伅",notes = "鐐瑰嚮鏉冮檺浜哄憳鏃惰Е鍙戣幏鍙�")
+ public Response<PageInfo<User>> getUserByRoleId(@RequestParam int pageNum,@RequestParam int pageSize,@RequestParam int roleId){
+ return userRoleService.getUserByRoleId(pageNum,pageSize,roleId);
+ }
+
+ @GetMapping("getUsersByRoleId")
+ @ApiOperation(value = "鑾峰彇瑙掕壊鐢ㄦ埛淇℃伅",notes = "鐐瑰嚮娣诲姞浜哄憳鏄Е鍙戣幏鍙�")
+ public Response getUsersByRoleId(@RequestParam int roleId){
+ return userRoleService.getUsersByRoleId(roleId);
+ }
+ @PutMapping("updateRoleUser")
+ @ApiOperation(value = "鏇存柊瑙掕壊鐢ㄦ埛淇℃伅",notes = "閰嶇疆浜哄憳淇℃伅淇濆瓨")
+ public Response updateRoleUser(@RequestParam int roleId,@RequestBody int[] userIds){
+ return userRoleService.updateRoleUser(roleId,userIds);
+ }
+
@PostMapping
@ApiOperation(value = "鏂板瑙掕壊")
- public boolean add(@RequestBody Role role){
+ public Response add(@RequestBody Role role){
return roleService.add(role);
}
- @PostMapping("batch")
- @ApiOperation(value = "鎵归噺鏂板瑙掕壊")
+ @PutMapping("updateRole")
+ @ApiOperation(value = "鏇存柊瑙掕壊")
+ public Response updateRole(@RequestBody Role role){
+ return roleService.updateRole(role);
+ }
+
+ @PutMapping("updateRoleState")
+ @ApiOperation(value = "鍚敤/鍐荤粨瑙掕壊")
+ public Response updateRoleState(@RequestParam int roleId,@RequestParam int state){
+ return roleService.updateRoleState(roleId,state);
+ }
+ @DeleteMapping("deleteRole")
+ @ApiOperation(value = "鍒犻櫎瑙掕壊")
+ public Response deleteRole(@RequestParam int roleId){
+ return roleService.deleteRole(roleId);
+ }
+
+
+
+
+
+
+
+// @PostMapping("batch")
+// @ApiOperation(value = "鎵归噺鏂板瑙掕壊")
public boolean addBatch(@RequestBody List<Role> roles){
return roleService.addBatch(roles);
}
- @PostMapping("bindingUserWithRole")
- @ApiOperation(value = "缁戝畾鐢ㄦ埛鍜岃鑹�")
+// @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鐨勬暟缁�")
+// @PostMapping("bindingUserWithRoleBatch")
+// @ApiOperation(value = "鎵归噺缁戝畾鐢ㄦ埛鍜岃鑹�",notes = "浼犲叆userId鍜宺oleId鐨勬暟缁�")
+// @CacheEvict(cacheNames = {"userBridge"},allEntries = true) //鍏ㄩ儴娓呴櫎
public boolean bindingUserWithRoleBatch(@RequestBody List<UserRole> userRoles){
return userRoleService.bindingUserWithRoleBatch(userRoles);
}
/**===============瑙掕壊涓庢潈闄�================**/
- @PostMapping("bindingRoleWithPrivilege")
- @ApiOperation(value = "缁戝畾瑙掕壊-鏉冮檺")
- public boolean bindingRoleWithPrivilege(@RequestParam int roleId,int privilegeId){
- return rolePermissionService.bindingUserWithRole(roleId,privilegeId);
+// @GetMapping("allPermissions")
+// @ApiOperation(value = "鑾峰彇鎵�鏈夋潈闄�")
+ public List<Permission> getAllPermissions(HttpServletRequest request){
+ return permissionService.getAll();
}
- @PostMapping("bindingRoleWithPrivilegeBatch")
- @ApiOperation(value = "鎵归噺缁戝畾瑙掕壊-鏉冮檺",notes = "浼犲叆roleId鍜宲rivilegeId鐨勬暟缁�")
- public boolean bindingRoleWithPrivilegeBatch(@RequestBody List<RolePermission> rolePermissions){
+// @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) //鍏ㄩ儴娓呴櫎
+ public boolean bindingRoleWithPermissionBatch(@RequestBody List<RolePermission> rolePermissions){
return rolePermissionService.bindingUserWithRoleBatch(rolePermissions);
}
- @GetMapping("privilege")
- @ApiOperation(value = "鑾峰彇褰撳墠鐢ㄦ埛鐨勬潈闄�")
- public List<Permission> getPrivileges(HttpServletRequest request){
- User user = CommonUtil.getUser(request);
- return rolePermissionService.getPrivileges(user.getId());
+// @GetMapping("permissions")
+// @ApiOperation(value = "鑾峰彇褰撳墠鐢ㄦ埛鐨勬潈闄�")
+ public List<Permission> getPermissions(HttpServletRequest request){
+ //User user = CommonUtil.getUser(request);
+ User user = (User) SecurityUtils.getSubject().getPrincipal();
+ return rolePermissionService.getPermissions(user.getId());
}
/**==============鐢ㄦ埛-瑙掕壊-鑿滃崟================**/
- @GetMapping("userMenu")
- @ApiOperation(value = "鑾峰彇褰撳墠鐢ㄦ埛鐨勮彍鍗�")
+ @GetMapping("allMenus")
+ @ApiOperation(value = "鑾峰彇鎵�鏈夎彍鍗�")
+ public List<Menu> getAllMenu(){
+ return roleMenuService.getAllMenus();
+ }
+
+ @GetMapping("roleMenu")
+ @ApiOperation(value = "鑾峰彇瑙掕壊鎵�鏈夎彍鍗�")
+ public List<Menu> getMenuByRoleId(@RequestParam int roleId){
+ return roleMenuService.getRoleMenu(roleId);
+ }
+
+ @PutMapping("updateRoleMenu")
+ @ApiOperation(value = "鏇存柊瑙掕壊鑿滃崟")
+ public Response updateRoleMenu(@RequestParam int roleId,@RequestBody int[] menuIds){
+ return roleMenuService.updateRoleMenu(roleId,menuIds);
+ }
+
+
+
+
+
+// @GetMapping("userMenu")
+// @ApiOperation(value = "鑾峰彇褰撳墠鐢ㄦ埛鐨勮彍鍗�")
public List<Menu> getUserMenu(HttpServletRequest request){
- User user = CommonUtil.getUser(request);
+ //User user = CommonUtil.getUser(request);
+ User user = (User) SecurityUtils.getSubject().getPrincipal();
return roleMenuService.getUserMenu(user.getId());
}
--
Gitblit v1.9.1