From a2eef4ed811bfd1ee2ecb95da3674ac9825e32fe Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Fri, 8 Jan 2021 22:22:23 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90resource=E3=80=91=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ResourceController.java | 8 +++---- .../modular/service/SysResourceService.java | 6 +++--- .../service/impl/SysResourceServiceImpl.java | 21 ++++++++++++------- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/controller/ResourceController.java b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/controller/ResourceController.java index 6472b3629..df3032033 100644 --- a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/controller/ResourceController.java +++ b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/controller/ResourceController.java @@ -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 result = this.sysResourceService.getResourceList(resourceRequest); + PageResult result = this.sysResourceService.getResourceList(resourceRequest); return new SuccessResponseData(result); } diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/service/SysResourceService.java b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/service/SysResourceService.java index 0e411b800..239babf42 100644 --- a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/service/SysResourceService.java +++ b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/service/SysResourceService.java @@ -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 { * @author fengshuonan * @date 2020/11/24 20:45 */ - Page getResourceList(ResourceRequest resourceRequest); + PageResult getResourceList(ResourceRequest resourceRequest); /** * 通过应用code获取获取资源下拉列表 @@ -67,4 +67,4 @@ public interface SysResourceService extends IService { */ ResourceDefinition getResourceDetail(ResourceRequest resourceRequest); -} \ No newline at end of file +} diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/service/impl/SysResourceServiceImpl.java b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/service/impl/SysResourceServiceImpl.java index 262bf5ab2..f8e18d2e2 100644 --- a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/service/impl/SysResourceServiceImpl.java +++ b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/service/impl/SysResourceServiceImpl.java @@ -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 implements SysResourceService, ResourceReportApi, ResourceServiceApi { - @Autowired + @Resource private SysResourceMapper resourceMapper; - @Autowired + @Resource private ResourceCache resourceCache; @Override - public Page getResourceList(ResourceRequest resourceRequest) { - Page page = PageFactory.defaultPage(); + public PageResult getResourceList(ResourceRequest resourceRequest) { LambdaQueryWrapper wrapper = createWrapper(resourceRequest); - return this.page(page, wrapper); + Page page = this.page(PageFactory.defaultPage(), wrapper); + return PageResultFactory.createPageResult(page); } @Override @@ -204,6 +206,11 @@ public class SysResourceServiceImpl extends ServiceImpl