From c26e227abe288476c11b0a8b7875045e71efa14c Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: Thu, 30 Apr 2026 17:30:00 +0800
Subject: [PATCH] 新增修改
---
multi-admin/src/main/java/com/gkhy/exam/admin/controller/system/SysRoleController.java | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/multi-admin/src/main/java/com/gkhy/exam/admin/controller/system/SysRoleController.java b/multi-admin/src/main/java/com/gkhy/exam/admin/controller/system/SysRoleController.java
index 2707da4..0cea266 100644
--- a/multi-admin/src/main/java/com/gkhy/exam/admin/controller/system/SysRoleController.java
+++ b/multi-admin/src/main/java/com/gkhy/exam/admin/controller/system/SysRoleController.java
@@ -2,12 +2,10 @@
import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.poi.excel.ExcelUtil;
import com.gkhy.exam.common.annotation.Log;
import com.gkhy.exam.common.api.CommonResult;
import com.gkhy.exam.common.domain.entity.SysRole;
import com.gkhy.exam.common.domain.entity.SysUser;
-import com.gkhy.exam.common.domain.model.LoginUser;
import com.gkhy.exam.common.domain.model.LoginUserDetails;
import com.gkhy.exam.common.enums.BusinessType;
import com.gkhy.exam.common.utils.SecurityUtils;
@@ -16,12 +14,14 @@
import com.gkhy.exam.system.domain.SysUserRole;
import com.gkhy.exam.system.service.ISysRoleService;
import com.gkhy.exam.system.service.SysUserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
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.*;
-import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -35,6 +35,7 @@
*
* @author expert
*/
+@Api(tags = "角色信息")
@RestController
@RequestMapping("/system/role")
public class SysRoleController
@@ -56,6 +57,7 @@
// @PreAuthorize("hasAnyAuthority('system:role:list')")
@GetMapping("/list")
+ @ApiOperation(value = "获取角色列表")
public CommonResult list(SysRole role)
{
@@ -76,7 +78,11 @@
* 根据角色编号获取详细信息
*/
//@PreAuthorize("hasAnyAuthority('system:role:query')")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", name = "roleId", dataType = "int", required = true, value = "roleId"),
+ })
@GetMapping(value = "/{roleId}")
+ @ApiOperation(value = "根据角色编号获取详细信息")
public CommonResult getInfo(@PathVariable Long roleId)
{
roleService.checkRoleDataScope(roleId);
@@ -89,6 +95,7 @@
//@PreAuthorize("hasAnyAuthority('system:role:add')")
//@Log(title = "角色管理", businessType = BusinessType.INSERT)
@PostMapping
+ @ApiOperation(value = "新增角色")
public CommonResult add(@Validated @RequestBody SysRole role)
{
if (!roleService.checkRoleNameUnique(role))
@@ -110,6 +117,7 @@
//@PreAuthorize("hasAnyAuthority('system:role:edit')")
//@Log(title = "角色管理", businessType = BusinessType.UPDATE)
@PutMapping
+ @ApiOperation(value = "修改保存角色")
public CommonResult edit(@Validated @RequestBody SysRole role)
{
roleService.checkRoleAllowed(role);
@@ -129,7 +137,7 @@
// 更新缓存用户权限
LoginUserDetails loginUser = getLoginUser();
- if (ObjectUtil.isNotNull(loginUser.getUser()) && !SecurityUtils.isAdmin(loginUser.getUser().getId()))
+ if (ObjectUtil.isNotNull(loginUser.getUser()) && !SecurityUtils.adminUser())
{
loginUser.setUser(userService.selectUserByUsername(loginUser.getUser().getName()));
loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
@@ -146,6 +154,7 @@
//@PreAuthorize("hasAnyAuthority('system:role:edit')")
//@Log(title = "角色管理", businessType = BusinessType.UPDATE)
@PutMapping("/dataScope")
+ @ApiOperation(value = "修改保存数据权限")
public CommonResult dataScope(@RequestBody SysRole role)
{
roleService.checkRoleAllowed(role);
@@ -159,6 +168,7 @@
//@PreAuthorize("hasAnyAuthority('system:role:edit')")
// @Log(title = "角色管理", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus")
+ @ApiOperation(value = "状态修改")
public CommonResult changeStatus(@RequestBody SysRole role)
{
roleService.checkRoleAllowed(role);
@@ -172,6 +182,10 @@
*/
//@PreAuthorize("hasAnyAuthority('system:role:remove')")
@Log(title = "角色管理", businessType = BusinessType.DELETE)
+ @ApiOperation(value = "删除角色")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", name = "roleIds", dataType = "array", required = true, value = "roleIds"),
+ })
@DeleteMapping("/{roleIds}")
public CommonResult remove(@PathVariable Long[] roleIds)
{
@@ -182,6 +196,7 @@
* 获取角色选择框列表
*/
//@PreAuthorize("hasAnyAuthority('system:role:query')")
+ @ApiOperation(value = "获取角色选择框列表")
@GetMapping("/optionselect")
public CommonResult optionselect()
{
@@ -192,6 +207,7 @@
* 查询已分配用户角色列表
*/
//@PreAuthorize("hasAnyAuthority('system:role:list')")
+ @ApiOperation(value = "查询已分配用户角色列表")
@GetMapping("/authUser/allocatedList")
public CommonResult allocatedList(SysUser user)
{
@@ -205,6 +221,8 @@
*/
//@PreAuthorize("hasAnyAuthority('system:role:list')")
@GetMapping("/authUser/unallocatedList")
+ @ApiOperation(value = "查询未分配用户角色列表")
+
public CommonResult unallocatedList(SysUser user)
{
startPage();
@@ -218,6 +236,7 @@
//@PreAuthorize("hasAnyAuthority('system:role:edit')")
@Log(title = "角色管理", businessType = BusinessType.GRANT)
@PutMapping("/authUser/cancel")
+ @ApiOperation(value = "取消授权用户")
public CommonResult cancelAuthUser(@RequestBody SysUserRole userRole)
{
return CommonResult.success(roleService.deleteAuthUser(userRole));
@@ -229,6 +248,11 @@
//@PreAuthorize("hasAnyAuthority('system:role:edit')")
@Log(title = "角色管理", businessType = BusinessType.GRANT)
@PutMapping("/authUser/cancelAll")
+ @ApiOperation(value = "批量取消授权用户")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", name = "userIds", dataType = "array", required = true, value = "用户id数组"),
+ @ApiImplicitParam(paramType = "query", name = "roleId", dataType = "int", required = true, value = "角色id"),
+ })
public CommonResult cancelAuthUserAll(Long roleId, Long[] userIds)
{
return CommonResult.success(roleService.deleteAuthUsers(roleId, userIds));
@@ -240,6 +264,11 @@
//@PreAuthorize("hasAnyAuthority('system:role:edit')")
@Log(title = "角色管理", businessType = BusinessType.GRANT)
@PutMapping("/authUser/selectAll")
+ @ApiOperation(value = "批量选择用户授权")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", name = "userIds", dataType = "array", required = true, value = "用户id数组"),
+ @ApiImplicitParam(paramType = "query", name = "roleId", dataType = "int", required = true, value = "角色id"),
+ })
public CommonResult selectAuthUserAll(Long roleId, Long[] userIds)
{
roleService.checkRoleDataScope(roleId);
@@ -251,6 +280,7 @@
*/
//@PreAuthorize("hasAnyAuthority('system:role:query')")
@GetMapping(value = "/deptTree/{roleId}")
+ @ApiOperation(value = "获取对应角色部门树列表")
public CommonResult deptTree(@PathVariable("roleId") Long roleId)
{
Map<String,Object> ajax = new HashMap<>();
--
Gitblit v1.9.2