From 2eb6f0f7ec0756b3125f5b488d8a9ac0d23223f9 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Thu, 29 Sep 2022 13:50:03 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.2.5=E3=80=91=E3=80=90role=E3=80=91?=
 =?UTF-8?q?=E8=BF=81=E7=A7=BB=E8=A7=92=E8=89=B2=E6=8E=88=E6=9D=83=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../role/controller/SysRoleAuthController.java   | 16 ++++++++++++++++
 .../role/controller/SysRoleController.java       | 12 ------------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/controller/SysRoleAuthController.java b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/controller/SysRoleAuthController.java
index 9aee04d18..5971ca388 100644
--- a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/controller/SysRoleAuthController.java
+++ b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/controller/SysRoleAuthController.java
@@ -33,6 +33,7 @@ import cn.stylefeng.roses.kernel.scanner.api.annotation.PostResource;
 import cn.stylefeng.roses.kernel.system.api.MenuServiceApi;
 import cn.stylefeng.roses.kernel.system.api.pojo.menu.MenuAndButtonTreeResponse;
 import cn.stylefeng.roses.kernel.system.api.pojo.role.request.SysRoleRequest;
+import cn.stylefeng.roses.kernel.system.modular.role.service.SysRoleResourceService;
 import cn.stylefeng.roses.kernel.system.modular.role.service.SysRoleService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -57,6 +58,9 @@ public class SysRoleAuthController {
     @Resource
     private MenuServiceApi menuServiceApi;
 
+    @Resource
+    private SysRoleResourceService sysRoleResourceService;
+
     /**
      * 获取角色分配菜单界面，绑定情况列表
      *
@@ -126,4 +130,16 @@ public class SysRoleAuthController {
         return new SuccessResponseData<>(sysRoleService.grantButtonGrantAll(sysRoleRequest));
     }
 
+    /**
+     * 角色绑定接口数据V2
+     *
+     * @author fengshuonan
+     * @date 2021/8/10 18:23
+     */
+    @PostResource(name = "角色绑定接口数据V2", path = "/sysRole/grantResourceV2")
+    public ResponseData<?> grantResourceV2(@RequestBody @Validated(SysRoleRequest.grantResourceV2.class) SysRoleRequest sysRoleRequest) {
+        sysRoleResourceService.grantResourceV2(sysRoleRequest);
+        return new SuccessResponseData<>();
+    }
+
 }
diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/controller/SysRoleController.java b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/controller/SysRoleController.java
index 186781ac5..e9dd7ad22 100644
--- a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/controller/SysRoleController.java
+++ b/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/controller/SysRoleController.java
@@ -136,18 +136,6 @@ public class SysRoleController {
         return new SuccessResponseData<>();
     }
 
-    /**
-     * 角色绑定接口数据
-     *
-     * @author fengshuonan
-     * @date 2021/8/10 18:23
-     */
-    @PostResource(name = "角色绑定接口数据V2", path = "/sysRole/grantResourceV2")
-    public ResponseData<?> grantResourceV2(@RequestBody @Validated(SysRoleRequest.grantResourceV2.class) SysRoleRequest sysRoleRequest) {
-        sysRoleResourceService.grantResourceV2(sysRoleRequest);
-        return new SuccessResponseData<>();
-    }
-
     /**
      * 角色授权菜单和按钮
      *