From 0bcca091e1e250b251b96e975e0ea55297596725 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BE=E5=87=A0=E6=B5=B7?= <zh56462271@qq.com>
Date: Fri, 4 Sep 2020 13:02:36 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=AE=80=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceimpl/ArticleServiceImpl.java       | 50 +++++++++----------
 1 file changed, 23 insertions(+), 27 deletions(-)

diff --git a/src/main/java/cn/celess/blog/service/serviceimpl/ArticleServiceImpl.java b/src/main/java/cn/celess/blog/service/serviceimpl/ArticleServiceImpl.java
index f05158c..e4338e5 100644
--- a/src/main/java/cn/celess/blog/service/serviceimpl/ArticleServiceImpl.java
+++ b/src/main/java/cn/celess/blog/service/serviceimpl/ArticleServiceImpl.java
@@ -306,14 +306,10 @@ public class ArticleServiceImpl implements ArticleService {
         List<Article> articleList = articleMapper.findAllByOpen(true);
         PageData<ArticleModel> pageData = new PageData<>(new PageInfo<Article>(articleList));
 
-        List<ArticleModel> articleModelList = new ArrayList<>();
-
-        articleList.forEach(article -> {
-            ArticleModel model = ModalTrans.article(article, true);
-            setPreAndNextArticle(model);
-            articleModelList.add(model);
-        });
-
+        List<ArticleModel> articleModelList = articleList
+                .stream()
+                .map(article -> setPreAndNextArticle(ModalTrans.article(article, true)))
+                .collect(Collectors.toList());
         pageData.setList(articleModelList);
         return pageData;
     }
@@ -329,15 +325,14 @@ public class ArticleServiceImpl implements ArticleService {
 
         List<ArticleModel> modelList = new ArrayList<>();
 
-        open.forEach(article -> {
-            ArticleModel model = ModalTrans.article(article, true);
-            model.setTags(null);
-            //            setPreAndNextArticle(model);
-            model.setNextArticle(null);
-            model.setPreArticle(null);
-            modelList.add(model);
-        });
-        return new PageData<ArticleModel>(new PageInfo<Article>(open), modelList);
+        modelList = open.stream()
+                .map(article -> ModalTrans.article(article, true))
+                .peek(articleModel -> {
+                    articleModel.setNextArticle(null);
+                    articleModel.setPreArticle(null);
+                })
+                .collect(Collectors.toList());
+        return new PageData<>(new PageInfo<>(open), modelList);
     }
 
     @Override
@@ -348,21 +343,22 @@ public class ArticleServiceImpl implements ArticleService {
         }
         PageHelper.startPage(page, count);
         List<ArticleTag> articleByTag = articleTagMapper.findArticleByTagAndOpen(tag.getId());
-        List<ArticleModel> modelList = new ArrayList<>();
-        articleByTag.forEach(articleTag -> {
-            ArticleModel model = ModalTrans.article(articleTag.getArticle(), true);
-            model.setNextArticle(null);
-            model.setPreArticle(null);
-            modelList.add(model);
-        });
-        return new PageData<ArticleModel>(new PageInfo<ArticleTag>(articleByTag), modelList);
+        List<ArticleModel> modelList = articleByTag
+                .stream()
+                .map(articleTag -> ModalTrans.article(articleTag.getArticle(), true))
+                .peek(articleModel -> {
+                    articleModel.setNextArticle(null);
+                    articleModel.setPreArticle(null);
+                }).collect(Collectors.toList());
+        return new PageData<>(new PageInfo<>(articleByTag), modelList);
     }
 
-    private void setPreAndNextArticle(ArticleModel articleModel) {
+    private ArticleModel setPreAndNextArticle(ArticleModel articleModel) {
         if (articleModel == null) {
-            return;
+            return null;
         }
         articleModel.setPreArticle(ModalTrans.article(articleMapper.getPreArticle(articleModel.getId()), true));
         articleModel.setNextArticle(ModalTrans.article(articleMapper.getNextArticle(articleModel.getId()), true));
+        return articleModel;
     }
 }