From 67b52dce127ca264bc6e227c04c181d68af4a93a Mon Sep 17 00:00:00 2001 From: liyawei Date: Fri, 20 May 2022 14:25:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0=E6=B8=85?= =?UTF-8?q?=E5=8D=95-=E5=A4=8D=E5=88=B6=E6=B8=85=E5=8D=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestEOController.java | 12 ++++++------ .../controller/ParamsManifestEOController.java | 13 ++++++++----- .../collect/mapper/xml/ParamsManifestEOMapper.xml | 7 ++++++- .../collect/service/IParamsManifestEOService.java | 3 ++- .../service/impl/ParamsManifestEOServiceImpl.java | 5 +++-- .../modules/cert/collect/vo/ParamsManifestVO.java | 2 ++ .../impl/BussDocumentLibraryEOServiceImpl.java | 2 +- 7 files changed, 28 insertions(+), 16 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java index 8fe193325..0e7e508c8 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java @@ -303,13 +303,13 @@ public class ParamsCollectManifestEOController extends JeroController getConfigLableList(ParamsCollectManifestVO paramsCollectManifestVO) { @@ -337,13 +337,13 @@ public class ParamsCollectManifestEOController extends JeroController getConfigLableListRefer(ParamsCollectManifestVO paramsCollectManifestVO) { diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java index 70e7f4263..801200bed 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java @@ -74,12 +74,15 @@ public class ParamsManifestEOController extends JeroController> getParamsTemplateList(ParamsTemplateEO paramsTemplateEO, - @RequestParam(name="cut") String cut) { - List list = paramsManifestEOService.getNewestPublishList(paramsTemplateEO); - return Result.OK(cut, list); + public Result getParamsTemplateList(ParamsTemplateEO paramsTemplateEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + @RequestParam(name="cut") String cut) { + Page page = new Page(pageNo, pageSize); + IPage pageList = paramsManifestEOService.getNewestPublishPage(page, paramsTemplateEO); + return Result.OK(cut, pageList); } /** diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml index ef5500544..213bef0de 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml @@ -23,6 +23,8 @@ + + @@ -70,8 +72,11 @@ pm.title as title, pm.project_id as project_id, pm.state as state, - pni.project_name as project_name + pni.project_name as project_name, + pm.params_template_id as params_template_id, + pt.params_template_name as params_template_name from params_manifest pm + left join params_template pt on pm.params_template_id = pt.id left join project_library_base as plb on plb.id = pm.project_id left join project_name_info as pni on plb.project_name_id = pni.id ) tmp_tb diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java index ae35d3c4c..169e775db 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java @@ -1,6 +1,7 @@ package com.jero.modules.cert.collect.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.cert.collect.entity.ParamsManifestEO; import com.jero.modules.cert.collect.vo.ParamsManifestHistoryVO; @@ -67,7 +68,7 @@ public interface IParamsManifestEOService extends IService { * 查询已发布的最新版的参数模板列表 * @return */ - List getNewestPublishList(ParamsTemplateEO paramsTemplateEO); + IPage getNewestPublishPage(Page page, ParamsTemplateEO paramsTemplateEO); IPage pageInfo(IPage page, ParamsManifestEO paramsManifestEO); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java index ffa2ecf50..9d7843ed8 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.exception.JeroBootException; import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO; @@ -216,12 +217,12 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl getNewestPublishList(ParamsTemplateEO paramsTemplateEO) { + public IPage getNewestPublishPage(Page page, ParamsTemplateEO paramsTemplateEO) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.gt(ParamsTemplateEO::getVersion, 0) // 已发布的 .eq(StringUtils.isNotEmpty(paramsTemplateEO.getRegion()), ParamsTemplateEO::getRegion, paramsTemplateEO.getRegion()) // 查询条件：适用地区 .like(StringUtils.isNotEmpty(paramsTemplateEO.getParamsTemplateName()), ParamsTemplateEO::getParamsTemplateName, paramsTemplateEO.getParamsTemplateName()); // 查询条件：参数模板 - return paramsTemplateEOService.list(queryWrapper); + return paramsTemplateEOService.page(page, queryWrapper); } @Override diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestVO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestVO.java index 32577bb31..41cef7162 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestVO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/vo/ParamsManifestVO.java @@ -15,4 +15,6 @@ public class ParamsManifestVO { private String projectName; private String projectId; private String state; + private String paramsTemplateName; + private String paramsTemplateId; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 8b4ce3d39..28a689a0c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -2798,7 +2798,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl