From c3b34d451edc3b0d1d1b731139395c44a6fb2ca4 Mon Sep 17 00:00:00 2001 From: stylefeng Date: Fri, 24 Jan 2025 18:43:55 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=908.3.3=E3=80=91=E3=80=90role=E3=80=91?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=EF=BC=9A=E8=8E=B7=E5=8F=96=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E7=9A=84=E6=95=B0=E6=8D=AE=E8=8C=83=E5=9B=B4=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/RoleDataScopeController.java | 44 +++++++++++++++++++ .../pojo/request/SysRoleDataScopeRequest.java | 4 +- .../role/service/SysRoleDataScopeService.java | 10 ----- .../impl/SysRoleDataScopeServiceImpl.java | 7 +-- 4 files changed, 46 insertions(+), 19 deletions(-) create mode 100644 kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/controller/RoleDataScopeController.java diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/controller/RoleDataScopeController.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/controller/RoleDataScopeController.java new file mode 100644 index 000000000..382d60c07 --- /dev/null +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/controller/RoleDataScopeController.java @@ -0,0 +1,44 @@ +package cn.stylefeng.roses.kernel.sys.modular.role.controller; + +import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; +import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; +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.sys.api.constants.PermissionCodeConstants; +import cn.stylefeng.roses.kernel.sys.modular.role.entity.SysRoleDataScope; +import cn.stylefeng.roses.kernel.sys.modular.role.pojo.request.SysRoleDataScopeRequest; +import cn.stylefeng.roses.kernel.sys.modular.role.service.SysRoleDataScopeService; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RestController; + +/** + * 角色数据范围配置 + * + * @author fengshuonan + * @since 2025/1/24 18:12 + */ +@RestController +@ApiResource(name = "角色数据范围配置") +public class RoleDataScopeController { + + @Resource + private SysRoleDataScopeService sysRoleDataScopeService; + + /** + * 获取角色的数据范围列表 + * + * @author fengshuonan + * @since 2025/1/24 18:12 + */ + @GetResource(name = "获取角色的数据范围列表", path = "/roleDataScope/getRoleDataScopePageList", requiredPermission = true, + requirePermissionCode = PermissionCodeConstants.CHANGE_ROLE_DATA_SCOPE) + public ResponseData> getRoleDataScopePageList( + @Validated(BaseRequest.page.class) SysRoleDataScopeRequest roleDataScopeRequest) { + PageResult pageList = sysRoleDataScopeService.findPage(roleDataScopeRequest); + return new SuccessResponseData<>(pageList); + } + +} diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/pojo/request/SysRoleDataScopeRequest.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/pojo/request/SysRoleDataScopeRequest.java index 226f2aba9..f67acb006 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/pojo/request/SysRoleDataScopeRequest.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/pojo/request/SysRoleDataScopeRequest.java @@ -19,21 +19,19 @@ public class SysRoleDataScopeRequest extends BaseRequest { /** * 主键 */ - @NotNull(message = "主键不能为空", groups = {edit.class, delete.class}) @ChineseDescription("主键") private Long roleDataScopeId; /** * 角色id */ - @NotNull(message = "角色id不能为空", groups = {add.class, edit.class}) + @NotNull(message = "角色id不能为空", groups = {page.class}) @ChineseDescription("角色id") private Long roleId; /** * 机构id */ - @NotNull(message = "机构id不能为空", groups = {add.class, edit.class}) @ChineseDescription("机构id") private Long organizationId; diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/SysRoleDataScopeService.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/SysRoleDataScopeService.java index c146b372b..fd1cc8edd 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/SysRoleDataScopeService.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/SysRoleDataScopeService.java @@ -54,16 +54,6 @@ public interface SysRoleDataScopeService extends IService { */ SysRoleDataScope detail(SysRoleDataScopeRequest sysRoleDataScopeRequest); - /** - * 获取列表 - * - * @param sysRoleDataScopeRequest 请求参数 - * @return List 返回结果 - * @author fengshuonan - * @date 2023/06/10 21:29 - */ - List findList(SysRoleDataScopeRequest sysRoleDataScopeRequest); - /** * 获取列表（带分页） * diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/SysRoleDataScopeServiceImpl.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/SysRoleDataScopeServiceImpl.java index e50940d05..74157214e 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/SysRoleDataScopeServiceImpl.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/SysRoleDataScopeServiceImpl.java @@ -77,12 +77,6 @@ public class SysRoleDataScopeServiceImpl extends ServiceImpl findList(SysRoleDataScopeRequest sysRoleDataScopeRequest) { - LambdaQueryWrapper wrapper = this.createWrapper(sysRoleDataScopeRequest); - return this.list(wrapper); - } - @Override public RoleBindDataScopeResponse getRoleBindDataScope(RoleBindDataScopeRequest roleBindDataScopeRequest) { @@ -195,6 +189,7 @@ public class SysRoleDataScopeServiceImpl extends ServiceImpl createWrapper(SysRoleDataScopeRequest sysRoleDataScopeRequest) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + // 根据角色id进行查询 Long roleId = sysRoleDataScopeRequest.getRoleId(); queryWrapper.eq(ObjectUtil.isNotNull(roleId), SysRoleDataScope::getRoleId, roleId);