zheng/blog-backEnd
1
0
Fork 0
Code Issues 5 Pull Requests 12 Actions Packages Projects Releases Wiki Activity

refactor: 简化代码

Browse Source
This commit is contained in:
禾几海
2020-09-04 13:02:36 +08:00
parent 3c69baa4ad
commit 0bcca091e1
1 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/main/java/cn/celess/blog/service/serviceimpl/ArticleServiceImpl.java
View File

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