From e55c8b0a92eb9715edd90c31dfd4de51a47b588b Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 04 十一月 2022 17:40:08 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/RoleController.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/RoleController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/RoleController.java
index 5e3f1e0..a9035da 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/RoleController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/RoleController.java
@@ -1,15 +1,15 @@
package com.sandu.ximon.admin.controller;
-import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.RoleParam;
+import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.RoleService;
import com.sandu.ximon.dao.domain.Role;
import com.sandu.ximon.dao.domain.RoleDetail;
+import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -23,7 +23,7 @@
@RestController
@RequestMapping("/v1/role")
public class RoleController {
-
+ private PermissionConfig permissionConfig;
private final RoleService roleService;
/**
@@ -31,6 +31,9 @@
*/
@GetMapping("/getRoleListByAdmin/{adminId}")
public ResponseVO<Object> getRoleListByAdmin(@PathVariable Long adminId) {
+ if (!permissionConfig.check(MenuEnum.ROLE_BY_ADMIN.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
List<Role> roles = roleService.listByAdminId(adminId);
return ResponseUtil.success(roles);
}
@@ -38,11 +41,19 @@
@GetMapping("/list")
public ResponseVO<Object> listRole(BaseConditionVO conditionVO) {
+ if (!permissionConfig.check(MenuEnum.ROLE_MANAGER.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+
List<RoleDetail> roleDetails = roleService.listRole(conditionVO.getPageNo(), conditionVO.getPageSize());
return ResponseUtil.success(roleDetails);
}
+
@PostMapping("/add")
public ResponseVO<Object> addRole(@Validated @RequestBody RoleParam param) {
+ if (!permissionConfig.check(MenuEnum.ROLE_ADD.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean result = roleService.addRole(param);
if (result) {
return ResponseUtil.success("娣诲姞鎴愬姛");
@@ -53,6 +64,9 @@
@PostMapping("/update/{roleId}")
public ResponseVO<Object> updateRole(@PathVariable Long roleId, @Validated @RequestBody RoleParam param) {
+ if (!permissionConfig.check(MenuEnum.ROLE_UPDATE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean result = roleService.updateRole(roleId, param);
if (result) {
return ResponseUtil.success("缂栬緫鎴愬姛");
@@ -63,6 +77,9 @@
@PostMapping("/del/{roleId}")
public ResponseVO<Object> delRole(@PathVariable Long roleId) {
+ if (!permissionConfig.check(MenuEnum.ROLE_DELETE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean result = roleService.delRole(roleId);
if (result) {
return ResponseUtil.success("鍒犻櫎鎴愬姛");
--
Gitblit v1.9.3