From 42295ef2ac0a5e78674cf24b62d6834138f0ffdc Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 29 十一月 2021 13:56:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java | 43 +++++++++++++++----------------------------
1 files changed, 15 insertions(+), 28 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
index 39b828d..2a33918 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
@@ -1,25 +1,21 @@
package com.ruoyi.web.controller.system;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.service.TokenService;
import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService;
-import com.ruoyi.system.service.SysPermissionService;
import io.swagger.annotations.*;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -39,12 +35,10 @@
public class SysRoleController extends BaseController {
private final ISysRoleService roleService;
- private final TokenService tokenService;
private final ISysUserService userService;
- private final SysPermissionService permissionService;
@ApiOperation("鏌ヨ瑙掕壊淇℃伅鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:role:list')")
+ @SaCheckPermission("system:role:list")
@GetMapping("/list")
public TableDataInfo<SysRole> list(SysRole role) {
return roleService.selectPageRoleList(role);
@@ -52,7 +46,7 @@
@ApiOperation("瀵煎嚭瑙掕壊淇℃伅鍒楄〃")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('system:role:export')")
+ @SaCheckPermission("system:role:export")
@PostMapping("/export")
public void export(SysRole role, HttpServletResponse response) {
List<SysRole> list = roleService.selectRoleList(role);
@@ -63,7 +57,7 @@
* 鏍规嵁瑙掕壊缂栧彿鑾峰彇璇︾粏淇℃伅
*/
@ApiOperation("鏍规嵁瑙掕壊缂栧彿鑾峰彇璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('system:role:query')")
+ @SaCheckPermission("system:role:query")
@GetMapping(value = "/{roleId}")
public AjaxResult<SysRole> getInfo(@ApiParam("瑙掕壊ID") @PathVariable Long roleId) {
roleService.checkRoleDataScope(roleId);
@@ -74,7 +68,7 @@
* 鏂板瑙掕壊
*/
@ApiOperation("鏂板瑙掕壊")
- @PreAuthorize("@ss.hasPermi('system:role:add')")
+ @SaCheckPermission("system:role:add")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult<Void> add(@Validated @RequestBody SysRole role) {
@@ -91,7 +85,7 @@
* 淇敼淇濆瓨瑙掕壊
*/
@ApiOperation("淇敼淇濆瓨瑙掕壊")
- @PreAuthorize("@ss.hasPermi('system:role:edit')")
+ @SaCheckPermission("system:role:edit")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult<Void> edit(@Validated @RequestBody SysRole role) {
@@ -103,13 +97,6 @@
}
if (roleService.updateRole(role) > 0) {
- // 鏇存柊缂撳瓨鐢ㄦ埛鏉冮檺
- LoginUser loginUser = getLoginUser();
- if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin()) {
- loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
- loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
- tokenService.setLoginUser(loginUser);
- }
return AjaxResult.success();
}
return AjaxResult.error("淇敼瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑱旂郴绠＄悊鍛�");
@@ -119,7 +106,7 @@
* 淇敼淇濆瓨鏁版嵁鏉冮檺
*/
@ApiOperation("淇敼淇濆瓨鏁版嵁鏉冮檺")
- @PreAuthorize("@ss.hasPermi('system:role:edit')")
+ @SaCheckPermission("system:role:edit")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping("/dataScope")
public AjaxResult<Void> dataScope(@RequestBody SysRole role) {
@@ -131,7 +118,7 @@
* 鐘舵�佷慨鏀�
*/
@ApiOperation("鐘舵�佷慨鏀�")
- @PreAuthorize("@ss.hasPermi('system:role:edit')")
+ @SaCheckPermission("system:role:edit")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus")
public AjaxResult<Void> changeStatus(@RequestBody SysRole role) {
@@ -143,7 +130,7 @@
* 鍒犻櫎瑙掕壊
*/
@ApiOperation("鍒犻櫎瑙掕壊")
- @PreAuthorize("@ss.hasPermi('system:role:remove')")
+ @SaCheckPermission("system:role:remove")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{roleIds}")
public AjaxResult<Void> remove(@ApiParam("宀椾綅ID涓�") @PathVariable Long[] roleIds) {
@@ -154,7 +141,7 @@
* 鑾峰彇瑙掕壊閫夋嫨妗嗗垪琛�
*/
@ApiOperation("鑾峰彇瑙掕壊閫夋嫨妗嗗垪琛�")
- @PreAuthorize("@ss.hasPermi('system:role:query')")
+ @SaCheckPermission("system:role:query")
@GetMapping("/optionselect")
public AjaxResult<List<SysRole>> optionselect() {
return AjaxResult.success(roleService.selectRoleAll());
@@ -164,7 +151,7 @@
* 鏌ヨ宸插垎閰嶇敤鎴疯鑹插垪琛�
*/
@ApiOperation("鏌ヨ宸插垎閰嶇敤鎴疯鑹插垪琛�")
- @PreAuthorize("@ss.hasPermi('system:role:list')")
+ @SaCheckPermission("system:role:list")
@GetMapping("/authUser/allocatedList")
public TableDataInfo<SysUser> allocatedList(SysUser user) {
return userService.selectAllocatedList(user);
@@ -174,7 +161,7 @@
* 鏌ヨ鏈垎閰嶇敤鎴疯鑹插垪琛�
*/
@ApiOperation("鏌ヨ鏈垎閰嶇敤鎴疯鑹插垪琛�")
- @PreAuthorize("@ss.hasPermi('system:role:list')")
+ @SaCheckPermission("system:role:list")
@GetMapping("/authUser/unallocatedList")
public TableDataInfo<SysUser> unallocatedList(SysUser user) {
return userService.selectUnallocatedList(user);
@@ -184,7 +171,7 @@
* 鍙栨秷鎺堟潈鐢ㄦ埛
*/
@ApiOperation("鍙栨秷鎺堟潈鐢ㄦ埛")
- @PreAuthorize("@ss.hasPermi('system:role:edit')")
+ @SaCheckPermission("system:role:edit")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.GRANT)
@PutMapping("/authUser/cancel")
public AjaxResult<Void> cancelAuthUser(@RequestBody SysUserRole userRole) {
@@ -199,7 +186,7 @@
@ApiImplicitParam(name = "roleId", value = "瑙掕壊ID", paramType = "query", dataTypeClass = String.class),
@ApiImplicitParam(name = "userIds", value = "鐢ㄦ埛ID涓�", paramType = "query", dataTypeClass = String.class)
})
- @PreAuthorize("@ss.hasPermi('system:role:edit')")
+ @SaCheckPermission("system:role:edit")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.GRANT)
@PutMapping("/authUser/cancelAll")
public AjaxResult<Void> cancelAuthUserAll(Long roleId, Long[] userIds) {
@@ -214,7 +201,7 @@
@ApiImplicitParam(name = "roleId", value = "瑙掕壊ID", paramType = "query", dataTypeClass = String.class),
@ApiImplicitParam(name = "userIds", value = "鐢ㄦ埛ID涓�", paramType = "query", dataTypeClass = String.class)
})
- @PreAuthorize("@ss.hasPermi('system:role:edit')")
+ @SaCheckPermission("system:role:edit")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.GRANT)
@PutMapping("/authUser/selectAll")
public AjaxResult<Void> selectAuthUserAll(Long roleId, Long[] userIds) {
--
Gitblit v1.9.3