From 504941eafbff8811838f570ee4fecc84e293cd45 Mon Sep 17 00:00:00 2001 From: Chopper Date: Sun, 26 Sep 2021 17:46:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E7=AB=A0=E5=B1=95=E7=A4=BA=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/lili/modules/page/entity/vos/ArticleVO.java | 2 +- .../cn/lili/modules/page/service/ArticleService.java | 6 ++++++ .../modules/page/serviceimpl/ArticleServiceImpl.java | 10 +++++++++- .../controller/other/ArticleManagerController.java | 2 +- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/page/entity/vos/ArticleVO.java b/framework/src/main/java/cn/lili/modules/page/entity/vos/ArticleVO.java index 997216bd3..5bd1df3c1 100644 --- a/framework/src/main/java/cn/lili/modules/page/entity/vos/ArticleVO.java +++ b/framework/src/main/java/cn/lili/modules/page/entity/vos/ArticleVO.java @@ -24,6 +24,6 @@ public class ArticleVO { @ApiModelProperty(value = "文章排序") private Integer sort; - @ApiModelProperty(value = "状态, allowableValues = OPEN,CLOSE") + @ApiModelProperty(value = "开启状态") private Boolean openStatus; } diff --git a/framework/src/main/java/cn/lili/modules/page/service/ArticleService.java b/framework/src/main/java/cn/lili/modules/page/service/ArticleService.java index a9bb5e123..cd677a0b2 100644 --- a/framework/src/main/java/cn/lili/modules/page/service/ArticleService.java +++ b/framework/src/main/java/cn/lili/modules/page/service/ArticleService.java @@ -21,6 +21,12 @@ import java.util.List; @CacheConfig(cacheNames = "{article}") public interface ArticleService extends IService
{ + /** + * 管理端获取文章 + * @param articleSearchParams + * @return + */ + IPage managerArticlePage(ArticleSearchParams articleSearchParams); /** * 获取文章分页 * diff --git a/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleServiceImpl.java b/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleServiceImpl.java index 2650e6b7a..db36adeda 100644 --- a/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleServiceImpl.java @@ -34,11 +34,19 @@ import java.util.List; public class ArticleServiceImpl extends ServiceImpl implements ArticleService { @Override - public IPage articlePage(ArticleSearchParams articleSearchParams) { + public IPage managerArticlePage(ArticleSearchParams articleSearchParams) { articleSearchParams.setSort("a.sort"); return this.baseMapper.getArticleList(PageUtil.initPage(articleSearchParams), articleSearchParams.queryWrapper()); } + @Override + public IPage articlePage(ArticleSearchParams articleSearchParams) { + articleSearchParams.setSort("a.sort"); + QueryWrapper queryWrapper = articleSearchParams.queryWrapper(); + queryWrapper.eq("open_status",true); + return this.baseMapper.getArticleList(PageUtil.initPage(articleSearchParams), queryWrapper); + } + @Override public List
list(String categoryId) { diff --git a/manager-api/src/main/java/cn/lili/controller/other/ArticleManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/ArticleManagerController.java index aa9f7c8a8..ce0a0921b 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/ArticleManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/ArticleManagerController.java @@ -49,7 +49,7 @@ public class ArticleManagerController { }) @GetMapping(value = "/getByPage") public ResultMessage> getByPage(ArticleSearchParams articleSearchParams) { - return ResultUtil.data(articleService.articlePage(articleSearchParams)); + return ResultUtil.data(articleService.managerArticlePage(articleSearchParams)); } @ApiOperation(value = "添加文章")