Merge branch 'stat' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/baseservers into stat

servers/boe-server-all/src/main/java/com/xboe/module/article/service/impl/ArticleServiceImpl.java

@@ -70,7 +70,7 @@ public class ArticleServiceImpl implements IArticleService{
 	public List<Article> articelList(Integer type) {
 		//先查出带有图片的
 		List<Article> articles = new ArrayList<>();
-		Article article = dao.findOne(FieldFilters.eq("status", Article.STATUS_PUBLISH), FieldFilters.eq("enabled", true), FieldFilters.eq("enabled", true),
+		Article article = dao.findOne(FieldFilters.eq("status", Article.STATUS_PUBLISH), FieldFilters.eq("deleted", false), FieldFilters.eq("enabled", true),
 				FieldFilters.isNotNull("coverurl"), FieldFilters.ge("coverurl", ""));
 		articles.add(article);
 
@@ -82,7 +82,7 @@ public class ArticleServiceImpl implements IArticleService{
 		}
 		builder.addFilter(FieldFilters.eq("status", Article.STATUS_PUBLISH));
 		builder.addFilter(FieldFilters.eq("enabled",true));
-		builder.addFilter(FieldFilters.eq("enabled",true));
+		builder.addFilter(FieldFilters.eq("deleted",false));
 		builder.setPageSize(3);
 		List<Article> list = dao.findList(builder.builder());
 		articles.addAll(list);

servers/boe-server-all/src/main/java/com/xboe/phase2/dao/UserGuestMsgDao.java

@@ -1,9 +1,9 @@
 package com.xboe.phase2.dao;
 
 import com.xboe.core.orm.BaseDao;
-import com.xboe.phase2.entity.GuestBook;
+import com.xboe.phase2.entity.UserGuestMsg;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class GuestBookDao extends BaseDao<GuestBook> {
+public class UserGuestMsgDao extends BaseDao<UserGuestMsg> {
 }

servers/boe-server-all/src/main/java/com/xboe/phase2/entity/UserGuestMsg.java

@@ -9,7 +9,9 @@ import lombok.EqualsAndHashCode;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.time.LocalDateTime;
+import java.util.List;
 
 
 /**
@@ -18,8 +20,8 @@ import java.time.LocalDateTime;
 @Data
 @Entity
 @EqualsAndHashCode(callSuper = false)
-@Table(name = SysConstant.TABLE_PRE+"guest_book")
+@Table(name = SysConstant.TABLE_PRE+"user_guestmsg")
-public class GuestBook extends BaseEntity {
+public class UserGuestMsg extends BaseEntity {
 
     private static final long serialVersionUID = -1546791463472018751L;
 
@@ -35,13 +37,30 @@ public class GuestBook extends BaseEntity {
      * */
     @Column(name = "content",length = 200)
     private String content;
-
+    
+    /**永远是一级的回复的id*/
+    @Column(name = "top_id",length = 20)
+    private String topId;
+    
     /**
-     * 回复内容
+     * 回复的上级的id,如果是一级回复，
+     */
+    @Column(name = "parent_id",length = 20)
+    private String parentId;
+    
+    /**
+     * 数据的级别，一级，二级回复，用于查询
+     * 如果查询回复，根据topId和level=2 就可以查出一个二级的全部的回复
+     */
+    @Column(name = "data_level",length = 1)
+    private Integer level;
+    
+    /**
+     * 回复数
      * */
-    @Column(name = "replys",columnDefinition = "text")
+    @Column(name = "replys")
-    private String replys;
+    private Integer replys;
-
+    
     /**
      * 回复时间
      * */
@@ -55,5 +74,10 @@ public class GuestBook extends BaseEntity {
     @Column(name = "praises")
     private Integer praises;
 
+    /**
+     * 回复的列表，用于前端显示
+     */
+    @Transient
+    private List<UserGuestMsg> replyList;
 
 }

servers/boe-server-all/src/main/java/com/xboe/school/impl/GuestAddHitsImpl.java

@@ -3,7 +3,7 @@ package com.xboe.school.impl;
 import com.xboe.core.orm.FieldUpdateType;
 import com.xboe.core.orm.UpdateBuilder;
 import com.xboe.module.interaction.service.ICallbackAddHits;
-import com.xboe.phase2.dao.GuestBookDao;
+import com.xboe.phase2.dao.UserGuestMsgDao;
 import com.xboe.standard.enums.BoedxHitsField;
 import com.xboe.standard.enums.BoedxResourceType;
 import org.springframework.stereotype.Service;
@@ -16,7 +16,7 @@ import javax.annotation.Resource;
 public class GuestAddHitsImpl implements ICallbackAddHits {
 
     @Resource
-    GuestBookDao guestBookDao;
+    UserGuestMsgDao guestBookDao;
 
     @Override
     public BoedxResourceType getType() {