From aca10878e77fb9b38daa29eaa153feee72be13b7 Mon Sep 17 00:00:00 2001 From: rays <1615175118@qq.com> Date: Fri, 18 Jun 2021 17:08:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=91=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modular/resource/controller/ApiController.java | 5 +++-- .../resource/service/SysResourceService.java | 2 +- .../resource/service/impl/ApiGroupServiceImpl.java | 1 + .../service/impl/SysResourceServiceImpl.java | 13 ++++++++++++- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ApiController.java b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ApiController.java index f9d28f34c..10ee850c2 100644 --- a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ApiController.java +++ b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ApiController.java @@ -32,6 +32,7 @@ import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource; import cn.stylefeng.roses.kernel.scanner.api.pojo.resource.ResourceDefinition; import cn.stylefeng.roses.kernel.system.api.pojo.resource.LayuiApiResourceTreeNode; import cn.stylefeng.roses.kernel.system.api.pojo.resource.ResourceRequest; +import cn.stylefeng.roses.kernel.system.modular.resource.entity.SysResource; import cn.stylefeng.roses.kernel.system.modular.resource.service.SysResourceService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; @@ -59,8 +60,8 @@ public class ApiController { * @date 2020/12/18 15:50 */ @GetResource(name = "获取接口树列表（用于接口文档页面）", path = "/resource/getTree", requiredLogin = false, responseClass = LayuiApiResourceTreeNode.class) - public ResponseData getTree() { - List resourceTree = sysResourceService.getApiResourceTree(); + public ResponseData getTree(ResourceRequest resourceRequest) { + List resourceTree = sysResourceService.getApiResourceTree(resourceRequest); return new SuccessResponseData(resourceTree); } 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 a9ee5effc..e8074e697 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 @@ -82,7 +82,7 @@ public interface SysResourceService extends IService { * @author fengshuonan * @date 2020/12/18 15:06 */ - List getApiResourceTree(); + List getApiResourceTree(ResourceRequest resourceRequest); /** * 获取资源的详情 diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/ApiGroupServiceImpl.java b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/ApiGroupServiceImpl.java index 9b0ebdfcc..abb73f357 100644 --- a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/ApiGroupServiceImpl.java +++ b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/ApiGroupServiceImpl.java @@ -187,6 +187,7 @@ public class ApiGroupServiceImpl extends ServiceImpl i wrapper.notLike(ApiGroup::getGroupPids, SymbolConstant.LEFT_SQUARE_BRACKETS + apiGroupRequest.getGroupId() + SymbolConstant.RIGHT_SQUARE_BRACKETS); wrapper.ne(ApiGroup::getGroupId, apiGroupRequest.getGroupId()); } + List apiGroups = this.list(wrapper); if (ObjectUtil.isNotEmpty(apiGroups)) { 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 8fa1229eb..f5ee8bfd8 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 @@ -196,12 +196,23 @@ public class SysResourceServiceImpl extends ServiceImpl getApiResourceTree() { + public List getApiResourceTree(ResourceRequest resourceRequest) { // 1. 获取所有的资源 LambdaQueryWrapper sysResourceLambdaQueryWrapper = new LambdaQueryWrapper<>(); sysResourceLambdaQueryWrapper.eq(SysResource::getViewFlag, YesOrNotEnum.N.getCode()); sysResourceLambdaQueryWrapper.select(SysResource::getAppCode, SysResource::getModularCode, SysResource::getModularName, SysResource::getResourceCode, SysResource::getUrl, SysResource::getResourceName); + + // 查询资源名称 + if (ObjectUtil.isNotEmpty(resourceRequest.getResourceName())) { + sysResourceLambdaQueryWrapper.like(SysResource::getResourceName, resourceRequest.getResourceName()); + } + + // 查询资源URL + if (ObjectUtil.isNotEmpty(resourceRequest.getUrl())) { + sysResourceLambdaQueryWrapper.like(SysResource::getUrl, resourceRequest.getUrl()); + } + List allResource = this.list(sysResourceLambdaQueryWrapper); // 2. 按应用和模块编码设置map