gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【resource】更新资源查询接口

pull/3/head
fengshuonan 2021-01-08 22:22:23 +08:00
parent 1f94d549c8
commit a2eef4ed81
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/controller/ResourceController.java
View File

@ -1,5 +1,6 @@
package cn.stylefeng.roses.kernel.resource.modular.controller;
import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
import cn.stylefeng.roses.kernel.resource.api.pojo.resource.ResourceDefinition;
@ -10,11 +11,10 @@ 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.system.pojo.resource.request.ResourceRequest;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
/**
@ -27,7 +27,7 @@ import java.util.List;
@ApiResource(name = "资源管理")
public class ResourceController {
@Autowired
@Resource
private SysResourceService sysResourceService;
/**
@ -38,7 +38,7 @@ public class ResourceController {
*/
@GetResource(name = "获取资源列表", path = "/resource/pageList")
public ResponseData pageList(ResourceRequest resourceRequest) {
Page<SysResource> result = this.sysResourceService.getResourceList(resourceRequest);
PageResult<SysResource> result = this.sysResourceService.getResourceList(resourceRequest);
return new SuccessResponseData(result);
}

6
kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/service/SysResourceService.java
View File

@ -1,10 +1,10 @@
package cn.stylefeng.roses.kernel.resource.modular.service;
import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
import cn.stylefeng.roses.kernel.resource.api.pojo.resource.ResourceDefinition;
import cn.stylefeng.roses.kernel.resource.modular.entity.SysResource;
import cn.stylefeng.roses.kernel.resource.modular.pojo.ResourceTreeNode;
import cn.stylefeng.roses.kernel.system.pojo.resource.request.ResourceRequest;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
@ -25,7 +25,7 @@ public interface SysResourceService extends IService<SysResource> {
* @author fengshuonan
* @date 2020/11/24 20:45
*/
Page<SysResource> getResourceList(ResourceRequest resourceRequest);
PageResult<SysResource> getResourceList(ResourceRequest resourceRequest);
/**
* 通过应用code获取获取资源下拉列表
@ -67,4 +67,4 @@ public interface SysResourceService extends IService<SysResource> {
*/
ResourceDefinition getResourceDetail(ResourceRequest resourceRequest);
}
}

21
kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/service/impl/SysResourceServiceImpl.java
View File

@ -2,6 +2,8 @@ package cn.stylefeng.roses.kernel.resource.modular.service.impl;
import cn.hutool.core.util.ObjectUtil;
import cn.stylefeng.roses.kernel.db.api.factory.PageFactory;
import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory;
import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
import cn.stylefeng.roses.kernel.resource.api.ResourceReportApi;
import cn.stylefeng.roses.kernel.resource.api.pojo.resource.ReportResourceParam;
import cn.stylefeng.roses.kernel.resource.api.pojo.resource.ResourceDefinition;
@ -21,11 +23,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestBody;
import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
@ -38,17 +40,17 @@ import java.util.stream.Collectors;
@Service
public class SysResourceServiceImpl extends ServiceImpl<SysResourceMapper, SysResource> implements SysResourceService, ResourceReportApi, ResourceServiceApi {
@Autowired
@Resource
private SysResourceMapper resourceMapper;
@Autowired
@Resource
private ResourceCache resourceCache;
@Override
public Page<SysResource> getResourceList(ResourceRequest resourceRequest) {
Page<SysResource> page = PageFactory.defaultPage();
public PageResult<SysResource> getResourceList(ResourceRequest resourceRequest) {
LambdaQueryWrapper<SysResource> wrapper = createWrapper(resourceRequest);
return this.page(page, wrapper);
Page<SysResource> page = this.page(PageFactory.defaultPage(), wrapper);
return PageResultFactory.createPageResult(page);
}
@Override
@ -204,6 +206,11 @@ public class SysResourceServiceImpl extends ServiceImpl<SysResourceMapper, SysRe
if (ObjectUtil.isNotEmpty(resourceRequest.getResourceName())) {
queryWrapper.like(SysResource::getResourceName, resourceRequest.getResourceName());
}
// 根据资源url
if (ObjectUtil.isNotEmpty(resourceRequest.getUrl())) {
queryWrapper.like(SysResource::getUrl, resourceRequest.getUrl());
}
}
return queryWrapper;
@ -308,4 +315,4 @@ public class SysResourceServiceImpl extends ServiceImpl<SysResourceMapper, SysRe
return finalTree;
}
}
}