【7.2.5】【role】迁移权限绑定界面的接口

kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/controller/SysMenuController.java

@@ -205,28 +205,4 @@ public class SysMenuController {
         return new SuccessResponseData<>(treeResponseList);
     }
 
-    /**
-     * 获取角色分配菜单界面，绑定情况列表
-     *
-     * @author fengshuonan
-     * @date 2022/9/28 16:04
-     */
-    @GetResource(name = "获取角色分配菜单界面，绑定情况列表", path = "/sysMenu/roleBindMenuList")
-    public ResponseData<List<MenuAndButtonTreeResponse>> roleBindMenuList(@Validated(SysRoleRequest.roleBindMenuList.class) SysRoleRequest sysRoleRequest) {
-        List<MenuAndButtonTreeResponse> treeResponseList = menuServiceApi.getRoleBindMenuList(sysRoleRequest);
-        return new SuccessResponseData<>(treeResponseList);
-    }
-
-    /**
-     * 获取角色分配操作权限，绑定情况列表
-     *
-     * @author fengshuonan
-     * @date 2022/9/28 17:23
-     */
-    @GetResource(name = "获取角色分配操作权限，绑定情况列表", path = "/sysMenu/roleBindOperateList")
-    public ResponseData<List<MenuAndButtonTreeResponse>> roleBindOperateList(@Validated(SysRoleRequest.roleBindMenuList.class) SysRoleRequest sysRoleRequest) {
-        List<MenuAndButtonTreeResponse> treeResponseList = menuServiceApi.getRoleBindOperateList(sysRoleRequest);
-        return new SuccessResponseData<>(treeResponseList);
-    }
-
 }

kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/controller/SysRoleAuthController.java

@@ -28,7 +28,9 @@ import cn.stylefeng.roses.kernel.rule.enums.ResBizTypeEnum;
 import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;
 import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
 import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
 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.SysRoleService;
@@ -52,6 +54,33 @@ public class SysRoleAuthController {
     @Resource
     private SysRoleService sysRoleService;
 
+    @Resource
+    private MenuServiceApi menuServiceApi;
+
+    /**
+     * 获取角色分配菜单界面，绑定情况列表
+     *
+     * @author fengshuonan
+     * @date 2022/9/28 16:04
+     */
+    @GetResource(name = "获取角色分配菜单界面，绑定情况列表", path = "/sysMenu/roleBindMenuList")
+    public ResponseData<List<MenuAndButtonTreeResponse>> roleBindMenuList(@Validated(SysRoleRequest.roleBindMenuList.class) SysRoleRequest sysRoleRequest) {
+        List<MenuAndButtonTreeResponse> treeResponseList = menuServiceApi.getRoleBindMenuList(sysRoleRequest);
+        return new SuccessResponseData<>(treeResponseList);
+    }
+
+    /**
+     * 获取角色分配操作权限，绑定情况列表
+     *
+     * @author fengshuonan
+     * @date 2022/9/28 17:23
+     */
+    @GetResource(name = "获取角色分配操作权限，绑定情况列表", path = "/sysMenu/roleBindOperateList")
+    public ResponseData<List<MenuAndButtonTreeResponse>> roleBindOperateList(@Validated(SysRoleRequest.roleBindMenuList.class) SysRoleRequest sysRoleRequest) {
+        List<MenuAndButtonTreeResponse> treeResponseList = menuServiceApi.getRoleBindOperateList(sysRoleRequest);
+        return new SuccessResponseData<>(treeResponseList);
+    }
+
     /**
      * 角色权限界面：角色绑定菜单权限
      *
@@ -71,8 +100,8 @@ public class SysRoleAuthController {
      */
     @PostResource(name = "角色权限界面，角色绑定操作权限", path = "/sysRole/grantButton")
     public ResponseData<List<MenuAndButtonTreeResponse>> grantButton(@RequestBody @Validated(SysRoleRequest.grantButton.class) SysRoleRequest sysRoleRequest) {
-        sysRoleService.grantButton(sysRoleRequest);
+        List<MenuAndButtonTreeResponse> menuAndButtonTreeResponses = sysRoleService.grantButton(sysRoleRequest);
-        return new SuccessResponseData<>();
+        return new SuccessResponseData<>(menuAndButtonTreeResponses);
     }
 
     /**

kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleService.java

@@ -122,7 +122,7 @@ public interface SysRoleService extends IService<SysRole>, RoleServiceApi {
      * @author fengshuonan
      * @date 2021/8/11 10:02
      */
-    void grantButton(SysRoleRequest sysRoleMenuButtonRequest);
+    List<MenuAndButtonTreeResponse> grantButton(SysRoleRequest sysRoleMenuButtonRequest);
 
     /**
      * 授权数据范围（组织机构）

kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleServiceImpl.java

@@ -310,7 +310,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     }
 
     @Override
-    public void grantButton(SysRoleRequest sysRoleMenuButtonRequest) {
+    public List<MenuAndButtonTreeResponse> grantButton(SysRoleRequest sysRoleMenuButtonRequest) {
         // 该模块下角色绑定的按钮全部删除
         List<Long> modularButtonIds = sysRoleMenuButtonRequest.getModularButtonIds();
         if (ObjectUtil.isNotEmpty(modularButtonIds)) {
@@ -337,6 +337,9 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
             }
             this.sysRoleMenuButtonService.saveBatch(sysRoleMenuButtons, sysRoleMenuButtons.size());
         }
+
+        // 返回角色绑定的按钮列表
+        return this.menuServiceApi.getRoleBindOperateList(sysRoleMenuButtonRequest);
     }
 
     @Override