新增树搜索

pull/22/head
rays 2021-06-18 17:08:34 +08:00
parent 08fa1f4d1b
commit aca10878e7
4 changed files with 17 additions and 4 deletions

View File

@ -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<LayuiApiResourceTreeNode> resourceTree = sysResourceService.getApiResourceTree();
public ResponseData getTree(ResourceRequest resourceRequest) {
List<LayuiApiResourceTreeNode> resourceTree = sysResourceService.getApiResourceTree(resourceRequest);
return new SuccessResponseData(resourceTree);
}

View File

@ -82,7 +82,7 @@ public interface SysResourceService extends IService<SysResource> {
* @author fengshuonan
* @date 2020/12/18 15:06
*/
List<LayuiApiResourceTreeNode> getApiResourceTree();
List<LayuiApiResourceTreeNode> getApiResourceTree(ResourceRequest resourceRequest);
/**
*

View File

@ -187,6 +187,7 @@ public class ApiGroupServiceImpl extends ServiceImpl<ApiGroupMapper, ApiGroup> i
wrapper.notLike(ApiGroup::getGroupPids, SymbolConstant.LEFT_SQUARE_BRACKETS + apiGroupRequest.getGroupId() + SymbolConstant.RIGHT_SQUARE_BRACKETS);
wrapper.ne(ApiGroup::getGroupId, apiGroupRequest.getGroupId());
}
List<ApiGroup> apiGroups = this.list(wrapper);
if (ObjectUtil.isNotEmpty(apiGroups)) {

View File

@ -196,12 +196,23 @@ public class SysResourceServiceImpl extends ServiceImpl<SysResourceMapper, SysRe
}
@Override
public List<LayuiApiResourceTreeNode> getApiResourceTree() {
public List<LayuiApiResourceTreeNode> getApiResourceTree(ResourceRequest resourceRequest) {
// 1. 获取所有的资源
LambdaQueryWrapper<SysResource> 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<SysResource> allResource = this.list(sysResourceLambdaQueryWrapper);
// 2. 按应用和模块编码设置map