refactor: 简化代码

src/main/java/cn/celess/blog/service/serviceimpl/ArticleServiceImpl.java

@@ -304,7 +304,7 @@ public class ArticleServiceImpl implements ArticleService {
     public PageData<ArticleModel> retrievePageForOpen(int count, int page) {
         PageHelper.startPage(page, count);
         List<Article> articleList = articleMapper.findAllByOpen(true);
-        PageData<ArticleModel> pageData = new PageData<>(new PageInfo<Article>(articleList));
+        PageData<ArticleModel> pageData = new PageData<>(new PageInfo<>(articleList));
 
         List<ArticleModel> articleModelList = articleList
                 .stream()
@@ -323,9 +323,7 @@ public class ArticleServiceImpl implements ArticleService {
         PageHelper.startPage(page, count);
         List<Article> open = articleMapper.findAllByCategoryIdAndOpen(category.getId());
 
-        List<ArticleModel> modelList = new ArrayList<>();
+        List<ArticleModel> modelList = open.stream()
-
-        modelList = open.stream()
                 .map(article -> ModalTrans.article(article, true))
                 .peek(articleModel -> {
                     articleModel.setNextArticle(null);

src/main/java/cn/celess/blog/service/serviceimpl/CategoryServiceImpl.java

@@ -17,8 +17,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author : xiaohai
@@ -68,22 +68,25 @@ public class CategoryServiceImpl implements CategoryService {
     public PageData<CategoryModel> retrievePage(int page, int count) {
         PageHelper.startPage(page, count);
         List<Category> all = categoryMapper.findAll();
-        List<CategoryModel> modelList = new ArrayList<>();
+        // 遍历没一个category
-        all.forEach(e -> {
+        List<CategoryModel> modelList = all
-            CategoryModel model = ModalTrans.category(e);
+                .stream()
-            List<Article> allByCategoryId = articleMapper.findAllByCategoryId(e.getId());
+                .map(ModalTrans::category)
-            List<ArticleModel> articleModelList = new ArrayList<>();
+                .peek(categoryModel -> {
-            allByCategoryId.forEach(article -> {
+                    // 根据category去查article，并赋值给categoryModel
-                ArticleModel articleModel = ModalTrans.article(article, true);
+                    List<Article> allByCategoryId = articleMapper.findAllByCategoryId(categoryModel.getId());
-                articleModel.setPreArticle(null);
+                    List<ArticleModel> articleModelList = allByCategoryId
-                articleModel.setNextArticle(null);
+                            .stream()
-                articleModel.setTags(null);
+                            .map(article -> ModalTrans.article(article, true))
-                articleModelList.add(articleModel);
+                            .peek(articleModel -> {
-            });
+                                // 去除不必要的字段
-            model.setArticles(articleModelList);
+                                articleModel.setPreArticle(null);
-            modelList.add(model);
+                                articleModel.setNextArticle(null);
-        });
+                                articleModel.setTags(null);
-
+                            })
-        return new PageData<CategoryModel>(new PageInfo<Category>(all), modelList);
+                            .collect(Collectors.toList());
+                    categoryModel.setArticles(articleModelList);
+                }).collect(Collectors.toList());
+        return new PageData<>(new PageInfo<>(all), modelList);
     }
 }

src/main/java/cn/celess/blog/service/serviceimpl/CommentServiceImpl.java

@@ -23,6 +23,7 @@ import org.springframework.stereotype.Service;
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author : xiaohai
@@ -107,14 +108,11 @@ public class CommentServiceImpl implements CommentService {
     @Override
     public List<CommentModel> retrievePageByPid(long pid) {
         List<Comment> allByPagePath = commentMapper.findAllByPid(pid);
-        List<CommentModel> commentModels = new ArrayList<>();
+        return allByPagePath
-        allByPagePath.forEach(comment -> {
+                .stream()
-            if (comment.getStatus() != CommentStatusEnum.DELETED.getCode()) {
+                .filter(comment -> comment.getStatus() != CommentStatusEnum.DELETED.getCode())
-                commentModels.add(ModalTrans.comment(comment));
+                .map(ModalTrans::comment)
-            }
+                .collect(Collectors.toList());
-        });
-
-        return commentModels;
     }
 
     @Override
@@ -145,14 +143,11 @@ public class CommentServiceImpl implements CommentService {
 
     private PageData<CommentModel> pageTrans(List<Comment> commentList, boolean noResponseList) {
         PageInfo<Comment> p = PageInfo.of(commentList);
-        List<CommentModel> modelList = new ArrayList<>();
+        List<CommentModel> modelList = commentList
-        commentList.forEach(l -> {
+                .stream()
-            CommentModel model = ModalTrans.comment(l);
+                .map(ModalTrans::comment)
-            if (!noResponseList) {
+                .peek(commentModel -> commentModel.setRespComment(this.retrievePageByPid(commentModel.getId())))
-                model.setRespComment(this.retrievePageByPid(model.getId()));
+                .collect(Collectors.toList());
-            }
+        return new PageData<>(p, modelList);
-            modelList.add(model);
-        });
-        return new PageData<CommentModel>(p, modelList);
     }
 }

src/main/java/cn/celess/blog/service/serviceimpl/TagServiceImpl.java

@@ -21,6 +21,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author : xiaohai
@@ -81,20 +82,22 @@ public class TagServiceImpl implements TagService {
         List<Tag> tagList = tagMapper.findAll();
         List<TagModel> modelList = new ArrayList<>();
         tagList.forEach(tag -> modelList.add(ModalTrans.tag(tag)));
-        return new PageData<TagModel>(new PageInfo<Tag>(tagList), modelList);
+        return new PageData<>(new PageInfo<>(tagList), modelList);
     }
 
     @Override
     public List<TagModel> findAll() {
-        List<TagModel> list = new ArrayList<>();
+        return tagMapper.findAll().stream()
-        tagMapper.findAll().forEach(e -> {
+                .map(ModalTrans::tag)
-            TagModel model = ModalTrans.tag(e);
+                .peek(tagModel -> {
-            List<ArticleTag> articleByTagAndOpen = articleTagMapper.findArticleByTagAndOpen(e.getId());
+                    List<ArticleTag> articleByTagAndOpen = articleTagMapper.findArticleByTagAndOpen(tagModel.getId());
-            List<ArticleModel> articleModelList = new ArrayList<>();
+                    tagModel.setArticles(
-            articleByTagAndOpen.forEach(articleTag -> articleModelList.add(ModalTrans.article(articleTag.getArticle(), true)));
+                            articleByTagAndOpen
-            model.setArticles(articleModelList);
+                                    .stream()
-            list.add(model);
+                                    .map(articleTag -> ModalTrans.article(articleTag.getArticle(), true))
-        });
+                                    .collect(Collectors.toList())
-        return list;
+                    );
+                })
+                .collect(Collectors.toList());
     }
 }