From f3637227614f3f7efa372d827f4dafb7cc8a85bf Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期四, 28 十二月 2023 11:24:12 +0800
Subject: [PATCH] 第二阶段

---
 user-server/src/main/java/com/yuanchu/mom/controller/RoleController.java |   43 ++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 38 insertions(+), 5 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..b6233db 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,10 +1,18 @@
 package com.yuanchu.mom.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.common.GetLook;
+import com.yuanchu.mom.dto.RolePowerDto;
 import com.yuanchu.mom.dto.UserPageDto;
+import com.yuanchu.mom.mapper.AuthMapper;
+import com.yuanchu.mom.mapper.PowerMapper;
 import com.yuanchu.mom.pojo.CustomEnum;
+import com.yuanchu.mom.pojo.Power;
 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;
@@ -14,10 +22,12 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.apache.ibatis.annotations.ResultType;
 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")
@@ -28,16 +38,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));
@@ -49,9 +61,30 @@
         return Result.success(roleService.delRole(id));
     }
 
-    @ApiOperation(value = "娣诲姞瑙掕壊淇℃伅")
+    @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(@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));
+    }
+
+    @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