From af6a08398e2bc22f3c8a3a615cbd9e23190be906 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 12 五月 2022 10:55:44 +0800
Subject: [PATCH] update 优化 文件与图片上传组件 使用id存储回显
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java | 70 +++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 27 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 2a33918..5d9a206 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,21 +1,25 @@
package com.ruoyi.web.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.ObjectUtil;
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.R;
+import com.ruoyi.common.core.domain.PageQuery;
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.enums.BusinessType;
+import com.ruoyi.common.helper.LoginHelper;
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.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -29,19 +33,20 @@
*/
@Validated
@Api(value = "瑙掕壊淇℃伅鎺у埗鍣�", tags = {"瑙掕壊淇℃伅绠＄悊"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RequiredArgsConstructor
@RestController
@RequestMapping("/system/role")
public class SysRoleController extends BaseController {
private final ISysRoleService roleService;
private final ISysUserService userService;
+ private final SysPermissionService permissionService;
@ApiOperation("鏌ヨ瑙掕壊淇℃伅鍒楄〃")
@SaCheckPermission("system:role:list")
@GetMapping("/list")
- public TableDataInfo<SysRole> list(SysRole role) {
- return roleService.selectPageRoleList(role);
+ public TableDataInfo<SysRole> list(SysRole role, PageQuery pageQuery) {
+ return roleService.selectPageRoleList(role, pageQuery);
}
@ApiOperation("瀵煎嚭瑙掕壊淇℃伅鍒楄〃")
@@ -59,9 +64,9 @@
@ApiOperation("鏍规嵁瑙掕壊缂栧彿鑾峰彇璇︾粏淇℃伅")
@SaCheckPermission("system:role:query")
@GetMapping(value = "/{roleId}")
- public AjaxResult<SysRole> getInfo(@ApiParam("瑙掕壊ID") @PathVariable Long roleId) {
+ public R<SysRole> getInfo(@ApiParam("瑙掕壊ID") @PathVariable Long roleId) {
roleService.checkRoleDataScope(roleId);
- return AjaxResult.success(roleService.selectRoleById(roleId));
+ return R.ok(roleService.selectRoleById(roleId));
}
/**
@@ -71,11 +76,11 @@
@SaCheckPermission("system:role:add")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult<Void> add(@Validated @RequestBody SysRole role) {
+ public R<Void> add(@Validated @RequestBody SysRole role) {
if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) {
- return AjaxResult.error("鏂板瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑹插悕绉板凡瀛樺湪");
+ return R.fail("鏂板瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑹插悕绉板凡瀛樺湪");
} else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) {
- return AjaxResult.error("鏂板瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑹叉潈闄愬凡瀛樺湪");
+ return R.fail("鏂板瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑹叉潈闄愬凡瀛樺湪");
}
return toAjax(roleService.insertRole(role));
@@ -88,18 +93,26 @@
@SaCheckPermission("system:role:edit")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult<Void> edit(@Validated @RequestBody SysRole role) {
+ public R<Void> edit(@Validated @RequestBody SysRole role) {
roleService.checkRoleAllowed(role);
+ roleService.checkRoleDataScope(role.getRoleId());
if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) {
- return AjaxResult.error("淇敼瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑹插悕绉板凡瀛樺湪");
+ return R.fail("淇敼瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑹插悕绉板凡瀛樺湪");
} else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) {
- return AjaxResult.error("淇敼瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑹叉潈闄愬凡瀛樺湪");
+ return R.fail("淇敼瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑹叉潈闄愬凡瀛樺湪");
}
if (roleService.updateRole(role) > 0) {
- return AjaxResult.success();
+ // 鏇存柊缂撳瓨鐢ㄦ埛鏉冮檺
+ LoginUser loginUser = getLoginUser();
+ SysUser sysUser = userService.selectUserById(loginUser.getUserId());
+ if (ObjectUtil.isNotNull(sysUser) && !sysUser.isAdmin()) {
+ loginUser.setMenuPermission(permissionService.getMenuPermission(sysUser));
+ LoginHelper.setLoginUser(loginUser);
+ }
+ return R.ok();
}
- return AjaxResult.error("淇敼瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ return R.fail("淇敼瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
/**
@@ -109,8 +122,9 @@
@SaCheckPermission("system:role:edit")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping("/dataScope")
- public AjaxResult<Void> dataScope(@RequestBody SysRole role) {
+ public R<Void> dataScope(@RequestBody SysRole role) {
roleService.checkRoleAllowed(role);
+ roleService.checkRoleDataScope(role.getRoleId());
return toAjax(roleService.authDataScope(role));
}
@@ -121,8 +135,9 @@
@SaCheckPermission("system:role:edit")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus")
- public AjaxResult<Void> changeStatus(@RequestBody SysRole role) {
+ public R<Void> changeStatus(@RequestBody SysRole role) {
roleService.checkRoleAllowed(role);
+ roleService.checkRoleDataScope(role.getRoleId());
return toAjax(roleService.updateRoleStatus(role));
}
@@ -133,7 +148,7 @@
@SaCheckPermission("system:role:remove")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{roleIds}")
- public AjaxResult<Void> remove(@ApiParam("宀椾綅ID涓�") @PathVariable Long[] roleIds) {
+ public R<Void> remove(@ApiParam("宀椾綅ID涓�") @PathVariable Long[] roleIds) {
return toAjax(roleService.deleteRoleByIds(roleIds));
}
@@ -143,8 +158,8 @@
@ApiOperation("鑾峰彇瑙掕壊閫夋嫨妗嗗垪琛�")
@SaCheckPermission("system:role:query")
@GetMapping("/optionselect")
- public AjaxResult<List<SysRole>> optionselect() {
- return AjaxResult.success(roleService.selectRoleAll());
+ public R<List<SysRole>> optionselect() {
+ return R.ok(roleService.selectRoleAll());
}
/**
@@ -153,8 +168,8 @@
@ApiOperation("鏌ヨ宸插垎閰嶇敤鎴疯鑹插垪琛�")
@SaCheckPermission("system:role:list")
@GetMapping("/authUser/allocatedList")
- public TableDataInfo<SysUser> allocatedList(SysUser user) {
- return userService.selectAllocatedList(user);
+ public TableDataInfo<SysUser> allocatedList(SysUser user, PageQuery pageQuery) {
+ return userService.selectAllocatedList(user, pageQuery);
}
/**
@@ -163,8 +178,8 @@
@ApiOperation("鏌ヨ鏈垎閰嶇敤鎴疯鑹插垪琛�")
@SaCheckPermission("system:role:list")
@GetMapping("/authUser/unallocatedList")
- public TableDataInfo<SysUser> unallocatedList(SysUser user) {
- return userService.selectUnallocatedList(user);
+ public TableDataInfo<SysUser> unallocatedList(SysUser user, PageQuery pageQuery) {
+ return userService.selectUnallocatedList(user, pageQuery);
}
/**
@@ -174,7 +189,7 @@
@SaCheckPermission("system:role:edit")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.GRANT)
@PutMapping("/authUser/cancel")
- public AjaxResult<Void> cancelAuthUser(@RequestBody SysUserRole userRole) {
+ public R<Void> cancelAuthUser(@RequestBody SysUserRole userRole) {
return toAjax(roleService.deleteAuthUser(userRole));
}
@@ -189,7 +204,7 @@
@SaCheckPermission("system:role:edit")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.GRANT)
@PutMapping("/authUser/cancelAll")
- public AjaxResult<Void> cancelAuthUserAll(Long roleId, Long[] userIds) {
+ public R<Void> cancelAuthUserAll(Long roleId, Long[] userIds) {
return toAjax(roleService.deleteAuthUsers(roleId, userIds));
}
@@ -204,7 +219,8 @@
@SaCheckPermission("system:role:edit")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.GRANT)
@PutMapping("/authUser/selectAll")
- public AjaxResult<Void> selectAuthUserAll(Long roleId, Long[] userIds) {
+ public R<Void> selectAuthUserAll(Long roleId, Long[] userIds) {
+ roleService.checkRoleDataScope(roleId);
return toAjax(roleService.insertAuthUsers(roleId, userIds));
}
}
--
Gitblit v1.9.3