From c219f11b51903d5aeb4c7ca261df593597aa7fe2 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期二, 16 四月 2024 17:59:54 +0800 Subject: [PATCH] 人员明细+报告编制的提交审核批准+能力范围的下拉数据字典 --- user-server/src/main/java/com/yuanchu/mom/controller/RoleController.java | 44 ++++++++++++++++++++++++++++++++++++-------- 1 files changed, 36 insertions(+), 8 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 acf7e33..5774f37 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,22 +1,21 @@ 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.annotation.ValueAuth; +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.List; import java.util.Map; @RequestMapping("/role") @@ -27,16 +26,18 @@ private RoleService roleService; + private PowerService powerService; + @ApiOperation(value = "鑾峰彇瑙掕壊鍒楄〃鏋氫妇") @GetMapping("/selectRoleList") - public Result selectUserList(){ + public Result selectRoleList(){ return Result.success(roleService.selectList()); } @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)); @@ -47,4 +48,31 @@ public Result delRole(Integer id){ return Result.success(roleService.delRole(id)); } + + @ApiOperation(value = "閫氳繃瑙掕壊id鏌ヨ鏉冮檺鍒楄〃") + @PostMapping("/selectPowerByRoleId") + public Result<?> selectPowerByRoleId(Integer id) { + return Result.success(powerService.selectPowerByRoleId(id)); + } + + @ApiOperation(value = "鑾峰彇鑿滃崟") + @GetMapping("/selectMenuList") + @ValueAuth + public Result<?> selectMenuList() { + return Result.success(roleService.selectMenuList()); + } + + @ApiOperation(value = "娣诲姞瑙掕壊") + @PostMapping("/addRole") + public Result<?> addRole(String str) { + RolePowerDto powers = JSON.parseObject(str, RolePowerDto.class); + return Result.success(roleService.addRole(powers)); + } + + @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