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 7a7eeda..f3e575d 100644 --- a/src/main/java/cn/celess/blog/service/serviceimpl/ArticleServiceImpl.java +++ b/src/main/java/cn/celess/blog/service/serviceimpl/ArticleServiceImpl.java @@ -120,8 +120,8 @@ public class ArticleServiceImpl implements ArticleService { } Article articleFromDb = articleMapper.findArticleById(article.getId()); - ArticleModel articleModel = ModalTrans.articleToModal(articleFromDb); - articleModel.setPreArticle(ModalTrans.articleToModal(articleMapper.getPreArticle(article.getId()))); + ArticleModel articleModel = ModalTrans.article(articleFromDb); + articleModel.setPreArticle(ModalTrans.article(articleMapper.getPreArticle(article.getId()))); return articleModel; } @@ -240,7 +240,7 @@ public class ArticleServiceImpl implements ArticleService { //更新完成移除 request.getSession().removeAttribute("article4update"); - ArticleModel articleModel = ModalTrans.articleToModal(articleMapper.findArticleById(article.getId())); + ArticleModel articleModel = ModalTrans.article(articleMapper.findArticleById(article.getId())); setPreAndNextArticle(articleModel); return articleModel; } @@ -257,7 +257,7 @@ public class ArticleServiceImpl implements ArticleService { throw new MyException(ResponseEnum.ARTICLE_NOT_PUBLIC); } } - ArticleModel articleModel = ModalTrans.articleToModal(article); + ArticleModel articleModel = ModalTrans.article(article); if (is4update) { //因更新而获取文章 不需要增加阅读量 @@ -281,7 +281,7 @@ public class ArticleServiceImpl implements ArticleService { PageData pageData = new PageData(new PageInfo
(articleList)); List articleModelList = new ArrayList<>(); articleList.forEach(article -> { - ArticleModel articleModel = ModalTrans.articleToModal(article); + ArticleModel articleModel = ModalTrans.article(article); articleModel.setMdContent(null); articleModelList.add(articleModel); }); @@ -298,7 +298,7 @@ public class ArticleServiceImpl implements ArticleService { List articleModelList = new ArrayList<>(); articleList.forEach(article -> { - ArticleModel model = ModalTrans.articleToModal(article); + ArticleModel model = ModalTrans.article(article); setPreAndNextArticle(model); model.setOpen(null); model.setMdContent(null); @@ -321,7 +321,7 @@ public class ArticleServiceImpl implements ArticleService { List modelList = new ArrayList<>(); open.forEach(article -> { - ArticleModel model = ModalTrans.articleToModal(article); + ArticleModel model = ModalTrans.article(article); model.setMdContent(null); model.setTags(null); model.setOpen(null); @@ -340,7 +340,7 @@ public class ArticleServiceImpl implements ArticleService { List articleByTag = articleTagMapper.findArticleByTagAndOpen(tag.getId()); List modelList = new ArrayList<>(); articleByTag.forEach(articleTag -> { - ArticleModel model = ModalTrans.articleToModal(articleTag.getArticle()); + ArticleModel model = ModalTrans.article(articleTag.getArticle()); model.setMdContent(null); model.setOpen(null); }); @@ -351,7 +351,7 @@ public class ArticleServiceImpl implements ArticleService { if (articleModel == null) { return; } - articleModel.setPreArticle(ModalTrans.articleToModal(articleMapper.getPreArticle(articleModel.getId()))); - articleModel.setNextArticle(ModalTrans.articleToModal(articleMapper.getNextArticle(articleModel.getId()))); + articleModel.setPreArticle(ModalTrans.article(articleMapper.getPreArticle(articleModel.getId()))); + articleModel.setNextArticle(ModalTrans.article(articleMapper.getNextArticle(articleModel.getId()))); } } diff --git a/src/main/java/cn/celess/blog/util/ModalTrans.java b/src/main/java/cn/celess/blog/util/ModalTrans.java index 35ba872..e518da6 100644 --- a/src/main/java/cn/celess/blog/util/ModalTrans.java +++ b/src/main/java/cn/celess/blog/util/ModalTrans.java @@ -1,8 +1,10 @@ package cn.celess.blog.util; import cn.celess.blog.entity.Article; +import cn.celess.blog.entity.Category; import cn.celess.blog.entity.User; import cn.celess.blog.entity.model.ArticleModel; +import cn.celess.blog.entity.model.CategoryModel; import cn.celess.blog.entity.model.UserModel; import org.springframework.beans.BeanUtils; @@ -13,7 +15,7 @@ import org.springframework.beans.BeanUtils; */ public class ModalTrans { - public static ArticleModel articleToModal(Article article) { + public static ArticleModel article(Article article) { if (article == null) { return null; } @@ -23,15 +25,20 @@ public class ModalTrans { articleModel.setUpdateDateFormat(DateFormatUtil.get(article.getUpdateDate())); articleModel.setOriginal(article.getType()); articleModel.setCategory(article.getCategory().getName()); - articleModel.setAuthor(userToModal(article.getUser())); + articleModel.setAuthor(user(article.getUser())); return articleModel; } - public static UserModel userToModal(User user) { + public static UserModel user(User user) { UserModel userModel = new UserModel(); BeanUtils.copyProperties(user, userModel); return userModel; } + public static CategoryModel category(Category category) { + CategoryModel model = new CategoryModel(); + BeanUtils.copyProperties(category, model); + return model; + } }