增加用户展示页面-新闻按条件查询

src/main/java/com/jkcredit/sysnews/resource/biz/newsArticle/NewsArticleBizResource.java

@@ -2,15 +2,18 @@ package com.jkcredit.sysnews.resource.biz.newsArticle;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jkcredit.sysnews.model.dto.newsArticle.NewsArticleDto;
 import com.jkcredit.sysnews.model.vo.newsArticle.NewsArticleBizVo;
 import com.jkcredit.sysnews.model.vo.newsArticle.NewsArticleVo;
 import com.jkcredit.sysnews.resource.base.BizResource;
+import com.jkcredit.sysnews.resource.web.newsArticle.fb.NewsArticleQueryFB;
 import com.jkcredit.sysnews.service.newsArticle.NewsArticleService;
 import com.jkcredit.sysnews.spi.lang.exception.ServiceException;
 import com.jkcredit.sysnews.spi.web.data.ResponseData;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
@@ -51,4 +54,17 @@ public class NewsArticleBizResource extends BizResource {
             return ResponseData.failed("获取新闻信息失败");
         }
     }
+
+
+    @GetMapping("newsArticles")
+    @ApiOperation("用户展示页面-根据条件获取新闻")
+    public ResponseData getNewsArticles(Page page, NewsArticleQueryFB queryFB) {
+        try {
+            NewsArticleDto newsArticleDto = mapper.map(queryFB, NewsArticleDto.class);
+            IPage<NewsArticleBizVo> newsArticleVoIPage = newsArticleService.getBizNewsArticles(page, newsArticleDto);
+            return ResponseData.success(newsArticleVoIPage);
+        } catch (ServiceException e) {
+            return ResponseData.failed("获取新闻列表失败");
+        }
+    }
 }

src/main/java/com/jkcredit/sysnews/service/newsArticle/NewsArticleService.java

@@ -26,4 +26,6 @@ public interface NewsArticleService {
     void deleteNewsArticle(Long id);
 
     IPage<NewsArticleBizVo> getNewsArticleByNavigationBarId(Page page, Long id);
+
+    IPage<NewsArticleBizVo> getBizNewsArticles(Page page, NewsArticleDto newsArticleDto);
 }

src/main/java/com/jkcredit/sysnews/service/newsArticle/NewsArticleServiceImpl.java

@@ -364,4 +364,10 @@ public class NewsArticleServiceImpl extends BaseService implements NewsArticleSe
         }
         return vo;
     }
+
+    @Override
+    public IPage<NewsArticleBizVo> getBizNewsArticles(Page page, NewsArticleDto newsArticleDto) {
+        IPage<NewsArticlePo> newsArticlePoIPage = mapper.getNewsArticles(page, newsArticleDto);
+        return newsArticlePoIPage.convert(this::convertNewsArticleBizVo);
+    }
 }