Service层修改 单元测试

src/main/java/cn/celess/blog/entity/model/ArticleModel.java

@@ -1,9 +1,11 @@
 package cn.celess.blog.entity.model;
 
+import cn.celess.blog.entity.Tag;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @author : xiaohai
@@ -57,40 +59,28 @@ public class ArticleModel {
     /**
      * 标签
      */
-    private String[] tags;
+    private List<Tag> tags;
 
     /**
      * 作者
      */
-    private Long authorId;
+    private UserModel author;
 
-    /**
-     * 作者名字
-     */
-    private String authorName;
+    private ArticleModel preArticle;
 
-    /**
-     * 上一篇文章
-     */
-    private Long preArticleId;
-
-    /**
-     * 下一篇文章
-     */
-    private Long nextArticleId;
-
-    private String preArticleTitle;
-
-    private String nextArticleTitle;
+    private ArticleModel nextArticle;
 
     /**
      * 阅读数
      */
     private Long readingNumber;
 
+    private Integer likeCount;
+
+    private Integer dislikeCount;
+
     /**
      * 文章的状态  true：公开  false:不公开
      */
     private Boolean open;
-
 }

src/main/java/cn/celess/blog/entity/model/PageData.java

@@ -0,0 +1,38 @@
+package cn.celess.blog.entity.model;
+
+import com.github.pagehelper.PageInfo;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @Author: 小海
+ * @Date: 2020-05-25 17:13
+ * @Desc:
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PageData<T> {
+
+    private List<T> list;
+
+    private long total;
+
+    private int pageSize;
+
+    private int pageNum;
+
+    public PageData(PageInfo pageInfo) {
+        this.pageNum = pageInfo.getPageNum();
+        this.pageSize = pageInfo.getPageSize();
+        this.total = pageInfo.getTotal();
+    }
+
+    public PageData(PageInfo pageInfo, List<T> data) {
+        this(pageInfo);
+        this.list = data;
+    }
+}