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

调整数据库字段，优化部分接口 #1

Merged
xiaohai2271 merged 33 commits from dev into master 2020-05-27 16:45:03 +08:00
Conversation 0 Commits 33 Files Changed 98 +20 -13
2 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c4ed6602e7 - Show all commits

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

@@ -120,8 +120,8 @@ public class ArticleServiceImpl implements ArticleService {
} }
Article articleFromDb = articleMapper.findArticleById(article.getId()); Article articleFromDb = articleMapper.findArticleById(article.getId());
ArticleModel articleModel = ModalTrans.articleToModal(articleFromDb); ArticleModel articleModel = ModalTrans.article(articleFromDb);
articleModel.setPreArticle(ModalTrans.articleToModal(articleMapper.getPreArticle(article.getId()))); articleModel.setPreArticle(ModalTrans.article(articleMapper.getPreArticle(article.getId())));
return articleModel; return articleModel;
} }
@@ -240,7 +240,7 @@ public class ArticleServiceImpl implements ArticleService {
//更新完成移除 //更新完成移除
request.getSession().removeAttribute("article4update"); request.getSession().removeAttribute("article4update");
ArticleModel articleModel = ModalTrans.articleToModal(articleMapper.findArticleById(article.getId())); ArticleModel articleModel = ModalTrans.article(articleMapper.findArticleById(article.getId()));
setPreAndNextArticle(articleModel); setPreAndNextArticle(articleModel);
return articleModel; return articleModel;
} }
@@ -257,7 +257,7 @@ public class ArticleServiceImpl implements ArticleService {
throw new MyException(ResponseEnum.ARTICLE_NOT_PUBLIC); throw new MyException(ResponseEnum.ARTICLE_NOT_PUBLIC);
} }
} }
ArticleModel articleModel = ModalTrans.articleToModal(article); ArticleModel articleModel = ModalTrans.article(article);
if (is4update) { if (is4update) {
//因更新而获取文章 不需要增加阅读量 //因更新而获取文章 不需要增加阅读量
@@ -281,7 +281,7 @@ public class ArticleServiceImpl implements ArticleService {
PageData<ArticleModel> pageData = new PageData<ArticleModel>(new PageInfo<Article>(articleList)); PageData<ArticleModel> pageData = new PageData<ArticleModel>(new PageInfo<Article>(articleList));
List<ArticleModel> articleModelList = new ArrayList<>(); List<ArticleModel> articleModelList = new ArrayList<>();
articleList.forEach(article -> { articleList.forEach(article -> {
ArticleModel articleModel = ModalTrans.articleToModal(article); ArticleModel articleModel = ModalTrans.article(article);
articleModel.setMdContent(null); articleModel.setMdContent(null);
articleModelList.add(articleModel); articleModelList.add(articleModel);
}); });
@@ -298,7 +298,7 @@ public class ArticleServiceImpl implements ArticleService {
List<ArticleModel> articleModelList = new ArrayList<>(); List<ArticleModel> articleModelList = new ArrayList<>();
articleList.forEach(article -> { articleList.forEach(article -> {
ArticleModel model = ModalTrans.articleToModal(article); ArticleModel model = ModalTrans.article(article);
setPreAndNextArticle(model); setPreAndNextArticle(model);
model.setOpen(null); model.setOpen(null);
model.setMdContent(null); model.setMdContent(null);
@@ -321,7 +321,7 @@ public class ArticleServiceImpl implements ArticleService {
List<ArticleModel> modelList = new ArrayList<>(); List<ArticleModel> modelList = new ArrayList<>();
open.forEach(article -> { open.forEach(article -> {
ArticleModel model = ModalTrans.articleToModal(article); ArticleModel model = ModalTrans.article(article);
model.setMdContent(null); model.setMdContent(null);
model.setTags(null); model.setTags(null);
model.setOpen(null); model.setOpen(null);
@@ -340,7 +340,7 @@ public class ArticleServiceImpl implements ArticleService {
List<ArticleTag> articleByTag = articleTagMapper.findArticleByTagAndOpen(tag.getId()); List<ArticleTag> articleByTag = articleTagMapper.findArticleByTagAndOpen(tag.getId());
List<ArticleModel> modelList = new ArrayList<>(); List<ArticleModel> modelList = new ArrayList<>();
articleByTag.forEach(articleTag -> { articleByTag.forEach(articleTag -> {
ArticleModel model = ModalTrans.articleToModal(articleTag.getArticle()); ArticleModel model = ModalTrans.article(articleTag.getArticle());
model.setMdContent(null); model.setMdContent(null);
model.setOpen(null); model.setOpen(null);
}); });
@@ -351,7 +351,7 @@ public class ArticleServiceImpl implements ArticleService {
if (articleModel == null) { if (articleModel == null) {
return; return;
} }
articleModel.setPreArticle(ModalTrans.articleToModal(articleMapper.getPreArticle(articleModel.getId()))); articleModel.setPreArticle(ModalTrans.article(articleMapper.getPreArticle(articleModel.getId())));
articleModel.setNextArticle(ModalTrans.articleToModal(articleMapper.getNextArticle(articleModel.getId()))); articleModel.setNextArticle(ModalTrans.article(articleMapper.getNextArticle(articleModel.getId())));
} }
} }

13
src/main/java/cn/celess/blog/util/ModalTrans.java
View File

@@ -1,8 +1,10 @@
package cn.celess.blog.util; package cn.celess.blog.util;
import cn.celess.blog.entity.Article; import cn.celess.blog.entity.Article;
import cn.celess.blog.entity.Category;
import cn.celess.blog.entity.User; import cn.celess.blog.entity.User;
import cn.celess.blog.entity.model.ArticleModel; import cn.celess.blog.entity.model.ArticleModel;
import cn.celess.blog.entity.model.CategoryModel;
import cn.celess.blog.entity.model.UserModel; import cn.celess.blog.entity.model.UserModel;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
@@ -13,7 +15,7 @@ import org.springframework.beans.BeanUtils;
*/ */
public class ModalTrans { public class ModalTrans {
public static ArticleModel articleToModal(Article article) { public static ArticleModel article(Article article) {
if (article == null) { if (article == null) {
return null; return null;
} }
@@ -23,15 +25,20 @@ public class ModalTrans {
articleModel.setUpdateDateFormat(DateFormatUtil.get(article.getUpdateDate())); articleModel.setUpdateDateFormat(DateFormatUtil.get(article.getUpdateDate()));
articleModel.setOriginal(article.getType()); articleModel.setOriginal(article.getType());
articleModel.setCategory(article.getCategory().getName()); articleModel.setCategory(article.getCategory().getName());
articleModel.setAuthor(userToModal(article.getUser())); articleModel.setAuthor(user(article.getUser()));
return articleModel; return articleModel;
} }
public static UserModel userToModal(User user) { public static UserModel user(User user) {
UserModel userModel = new UserModel(); UserModel userModel = new UserModel();
BeanUtils.copyProperties(user, userModel); BeanUtils.copyProperties(user, userModel);
return userModel; return userModel;
} }
public static CategoryModel category(Category category) {
CategoryModel model = new CategoryModel();
BeanUtils.copyProperties(category, model);
return model;
}
} }