diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/role/request/SysRoleRequest.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/role/request/SysRoleRequest.java index a39622c58..f738dd1cd 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/role/request/SysRoleRequest.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/role/request/SysRoleRequest.java @@ -181,6 +181,12 @@ public class SysRoleRequest extends BaseRequest { @NotNull(message = "绑定标识不能为空", groups = {grantMenusAndButtons.class, grantRoleMenus.class}) private Boolean selectBindFlag; + /** + * 资源的业务类型:1-业务类型,2-系统类型 + */ + @ChineseDescription("资源的业务类型:1-业务类型,2-系统类型") + private Integer resourceBizType; + /** * 参数校验分组:授权菜单和按钮 */ diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuResourceServiceImpl.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuResourceServiceImpl.java index 97aadd6bf..e38c589d9 100644 --- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuResourceServiceImpl.java +++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuResourceServiceImpl.java @@ -61,7 +61,7 @@ public class SysMenuResourceServiceImpl extends ServiceImpl list = this.list(wrapper); List resourceCodes = list.stream().map(SysMenuResource::getResourceCode).collect(Collectors.toList()); - return sysResourceService.getResourceList(resourceCodes, true); + return sysResourceService.getResourceList(resourceCodes, true, null); } @Override diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ResourceController.java b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ResourceController.java index e0e5389ec..8ed5351c2 100644 --- a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ResourceController.java +++ b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ResourceController.java @@ -85,7 +85,7 @@ public class ResourceController { */ @GetResource(name = "Layui版本--获取资源树列表,用于角色分配接口权限", path = "/resource/getRoleResourceTree") public List getLateralTree(SysRoleRequest sysRoleRequest) { - return sysResourceService.getRoleResourceTree(sysRoleRequest.getRoleId(), false); + return sysResourceService.getRoleResourceTree(sysRoleRequest.getRoleId(), false, null); } /** @@ -96,7 +96,7 @@ public class ResourceController { */ @GetResource(name = "AntdVue版本--获取资源树列表,用于角色分配接口权限", path = "/resource/getRoleResourceTreeAntdv") public ResponseData> getLateralTreeChildren(SysRoleRequest sysRoleRequest) { - List resourceLateralTree = sysResourceService.getRoleResourceTree(sysRoleRequest.getRoleId(), true); + List resourceLateralTree = sysResourceService.getRoleResourceTree(sysRoleRequest.getRoleId(), true, sysRoleRequest.getResourceBizType()); return new SuccessResponseData<>(resourceLateralTree); } } diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/SysResourceService.java b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/SysResourceService.java index 4f06a8c9b..0820bbf30 100644 --- a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/SysResourceService.java +++ b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/SysResourceService.java @@ -67,22 +67,24 @@ public interface SysResourceService extends IService { /** * 获取角色绑定的资源树列表,用于分配接口权限 * - * @param roleId 角色id - * @param treeBuildFlag true-带树形结构,false-不组装树形结构的 - * @author majianguo - * @date 2021/1/9 15:08 + * @param roleId 角色id + * @param treeBuildFlag true-带树形结构,false-不组装树形结构的 + * @param resourceBizType 资源的类型,1-业务类,2-系统类 + * @author fengshuonan + * @date 2022/9/28 23:46 */ - List getRoleResourceTree(Long roleId, Boolean treeBuildFlag); + List getRoleResourceTree(Long roleId, Boolean treeBuildFlag, Integer resourceBizType); /** * 获取资源绑定列表(业务通用) * - * @param resourceCodes 业务已经绑定的资源的编码集合 - * @param treeBuildFlag 是否要构建成树 + * @param resourceCodes 业务已经绑定的资源的编码集合 + * @param treeBuildFlag 是否要构建成树 + * @param resourceBizType 资源的类型,1-业务类,2-系统类 * @author fengshuonan * @date 2021/8/8 22:24 */ - List getResourceList(List resourceCodes, Boolean treeBuildFlag); + List getResourceList(List resourceCodes, Boolean treeBuildFlag, Integer resourceBizType); /** * 获取资源树列表,用于生成api接口 diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/SysResourceServiceImpl.java b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/SysResourceServiceImpl.java index 4ad29a61b..d31b3bae5 100644 --- a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/SysResourceServiceImpl.java +++ b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/SysResourceServiceImpl.java @@ -117,7 +117,7 @@ public class SysResourceServiceImpl extends ServiceImpl getRoleResourceTree(Long roleId, Boolean treeBuildFlag) { + public List getRoleResourceTree(Long roleId, Boolean treeBuildFlag, Integer resourceBizType) { // 查询当前角色已有的接口 List resourceList = roleServiceApi.getRoleResourceList(Collections.singletonList(roleId)); @@ -128,11 +128,11 @@ public class SysResourceServiceImpl extends ServiceImpl getResourceList(List resourceCodes, Boolean treeBuildFlag) { + public List getResourceList(List resourceCodes, Boolean treeBuildFlag, Integer resourceBizType) { List res = new ArrayList<>(); // 获取所有的资源 @@ -143,6 +143,9 @@ public class SysResourceServiceImpl extends ServiceImpl