From 2bfebb31df25d8ddc0c5ccaff4bed91d87e1070b Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 24 七月 2024 17:45:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/mom/controller/RoleController.java | 51 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 36 insertions(+), 15 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/RoleController.java b/user-server/src/main/java/com/yuanchu/mom/controller/RoleController.java
index 4142e36..c87ab6d 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/RoleController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/RoleController.java
@@ -1,23 +1,20 @@
package com.yuanchu.mom.controller;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yuanchu.mom.dto.UserPageDto;
-import com.yuanchu.mom.pojo.CustomEnum;
+import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.annotation.ValueClassify;
+import com.yuanchu.mom.dto.RolePowerDto;
import com.yuanchu.mom.pojo.Role;
-import com.yuanchu.mom.pojo.User;
+import com.yuanchu.mom.service.PowerService;
import com.yuanchu.mom.service.RoleService;
-import com.yuanchu.mom.service.UserService;
import com.yuanchu.mom.utils.JackSonUtil;
-import com.yuanchu.mom.utils.Jwt;
-import com.yuanchu.mom.utils.RedisUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.HashMap;
import java.util.Map;
@RequestMapping("/role")
@@ -28,30 +25,54 @@
private RoleService roleService;
+ private PowerService powerService;
+
+ @ValueAuth
@ApiOperation(value = "鑾峰彇瑙掕壊鍒楄〃鏋氫妇")
@GetMapping("/selectRoleList")
- public Result selectUserList(){
+ public Result selectRoleList(){
return Result.success(roleService.selectList());
}
-
+ @ValueClassify("瑙掕壊绠＄悊")
@ApiOperation(value = "鑾峰彇瑙掕壊鍒楄〃")
@PostMapping("/selectRoleLists")
- public Result selectRoleList(@RequestBody Map<String, Object> data) throws Exception {
+ public Result selectRoleLists(@RequestBody Map<String, Object> data) throws Exception {
Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
Role role = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Role.class);
return Result.success(roleService.selectUserList(page, role));
}
-
+ @ValueClassify("瑙掕壊绠＄悊")
@ApiOperation(value = "鍒犻櫎瑙掕壊鍒楄〃")
@PostMapping("/delRole")
public Result delRole(Integer id){
return Result.success(roleService.delRole(id));
}
+ @ValueAuth
+ @ApiOperation(value = "閫氳繃瑙掕壊id鏌ヨ鏉冮檺鍒楄〃")
+ @PostMapping("/selectPowerByRoleId")
+ public Result<?> selectPowerByRoleId(Integer id) {
+ return Result.success(powerService.selectPowerByRoleId(id));
+ }
- @ApiOperation(value = "娣诲姞瑙掕壊淇℃伅")
+ @ApiOperation(value = "鑾峰彇鑿滃崟")
+ @GetMapping("/selectMenuList")
+ @ValueAuth
+ public Result<?> selectMenuList() {
+ return Result.success(roleService.selectMenuList());
+ }
+ @ValueClassify("瑙掕壊绠＄悊")
+ @ApiOperation(value = "娣诲姞瑙掕壊")
@PostMapping("/addRole")
- public Result<?> addRole(@RequestBody Role role) {
- return Result.success(roleService.addRole(role));
+ public Result<?> addRole(String str) {
+ RolePowerDto powers = JSON.parseObject(str, RolePowerDto.class);
+ return Result.success(roleService.addRole(powers));
+ }
+ @ValueClassify("瑙掕壊绠＄悊")
+ @ApiOperation(value = "淇敼瑙掕壊淇℃伅")
+ @PostMapping("/upRole")
+ public Result<?> upRole(String str) {
+ RolePowerDto powers = JSON.parseObject(str, RolePowerDto.class);
+ return Result.success(roleService.upRole(powers));
}
}
--
Gitblit v1.9.3