更新

Author: diyhi

pom.xml

@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>bbs</groupId>
 	<artifactId>bbs</artifactId>
-	<version>6.0</version>
+	<version>6.1</version>
 	<packaging>war</packaging>
 	<name>bbs</name>
 	<description/>

src/main/java/cms/bean/help/Help.java

@@ -43,6 +43,11 @@ public class Help implements Serializable{
 	/** 帮助内容 **/
 	@Lob
 	private String content;
+	/** 是否使用Markdown **/
+	private Boolean isMarkdown;
+	/** Markdown内容 **/
+	@Lob
+	private String markdownContent;
 	/** 发表时间 **/
 	@Temporal(TemporalType.TIMESTAMP)
 	private Date times = new Date();
@@ -121,6 +126,18 @@ public boolean isVisible() {
 	public void setVisible(boolean visible) {
 		this.visible = visible;
 	}
+	public Boolean getIsMarkdown() {
+		return isMarkdown;
+	}
+	public void setIsMarkdown(Boolean isMarkdown) {
+		this.isMarkdown = isMarkdown;
+	}
+	public String getMarkdownContent() {
+		return markdownContent;
+	}
+	public void setMarkdownContent(String markdownContent) {
+		this.markdownContent = markdownContent;
+	}
 
 
 

src/main/java/cms/bean/question/Answer.java

@@ -68,6 +68,11 @@ public class Answer implements Serializable{
 	/** 答案内容 **/
 	@Lob
 	private String content;
+	/** 是否使用Markdown **/
+	private Boolean isMarkdown;
+	/** Markdown内容 **/
+	@Lob
+	private String markdownContent;
 	/** 回答时间 **/
 	@Temporal(TemporalType.TIMESTAMP)
 	private Date postTime = new Date();
@@ -253,6 +258,22 @@ public Integer getUserInfoStatus() {
 	public void setUserInfoStatus(Integer userInfoStatus) {
 		this.userInfoStatus = userInfoStatus;
 	}
+
+	public Boolean getIsMarkdown() {
+		return isMarkdown;
+	}
+
+	public void setIsMarkdown(Boolean isMarkdown) {
+		this.isMarkdown = isMarkdown;
+	}
+
+	public String getMarkdownContent() {
+		return markdownContent;
+	}
+
+	public void setMarkdownContent(String markdownContent) {
+		this.markdownContent = markdownContent;
+	}
 
 
 

src/main/java/cms/bean/question/AppendQuestionItem.java

@@ -3,6 +3,8 @@
 import java.io.Serializable;
 import java.util.Date;
 
+import javax.persistence.Lob;
+
 /**
  * 追加问题项
  * @author Gao
@@ -14,6 +16,10 @@ public class AppendQuestionItem implements Serializable{
 	private String id;
 	/** 追加内容 **/
 	private String content;
+	/** 是否使用Markdown **/
+	private Boolean isMarkdown;
+	/** Markdown内容 **/
+	private String markdownContent;
 	/** 追加时间 **/
 	private Date postTime;
 
@@ -36,6 +42,18 @@ public Date getPostTime() {
 	public void setPostTime(Date postTime) {
 		this.postTime = postTime;
 	}
+	public Boolean getIsMarkdown() {
+		return isMarkdown;
+	}
+	public void setIsMarkdown(Boolean isMarkdown) {
+		this.isMarkdown = isMarkdown;
+	}
+	public String getMarkdownContent() {
+		return markdownContent;
+	}
+	public void setMarkdownContent(String markdownContent) {
+		this.markdownContent = markdownContent;
+	}
 
 
 }

src/main/java/cms/bean/question/Question.java

@@ -41,6 +41,11 @@ public class Question implements Serializable{
 	/** 问题内容 **/
 	@Lob
 	private String content;
+	/** 是否使用Markdown **/
+	private Boolean isMarkdown;
+	/** Markdown内容 **/
+	@Lob
+	private String markdownContent;
 	/** 内容摘要 **/
 	@Lob
 	private String summary;
@@ -322,6 +327,26 @@ public Integer getUserInfoStatus() {
 	public void setUserInfoStatus(Integer userInfoStatus) {
 		this.userInfoStatus = userInfoStatus;
 	}
+
+
+	public Boolean getIsMarkdown() {
+		return isMarkdown;
+	}
+
+
+	public void setIsMarkdown(Boolean isMarkdown) {
+		this.isMarkdown = isMarkdown;
+	}
+
+
+	public String getMarkdownContent() {
+		return markdownContent;
+	}
+
+
+	public void setMarkdownContent(String markdownContent) {
+		this.markdownContent = markdownContent;
+	}
 
 
 }

src/main/java/cms/bean/setting/SystemSetting.java

@@ -37,6 +37,9 @@ public class SystemSetting implements Serializable{
 	/** 支持访问设备 1.自动识别终端 2.电脑端 3.移动端 **/
 	private Integer supportAccessDevice = 1;
 
+	/** 支持编辑器 10.仅富文本编辑器 20.仅Markdown编辑器  30.富文本编辑器优先 40.Markdown编辑器优先 **/
+	private Integer supportEditor = 10;
+	
 	/** 是否允许注册
 	private boolean allowRegister = true; **/
 	/** 允许注册账号类型 json AllowRegisterAccount格式数据**/
@@ -174,6 +177,11 @@ public class SystemSetting implements Serializable{
 	/** 后台分页数量 **/
 	private Integer backstagePageNumber = 20;
 
+	/** 话题热度因子加权    例如：评论=200|点赞=100|浏览量=1|重力因子=1.8    以竖线符号分割各热度因子，因子的分数越高，在热度因子中占比重越大；如果不设参数，则因子的加权值默认为1；因子加权值“评论|点赞|浏览量”可以为0至9999之间的整数，“重力因子”可以为0.1至2之间的数  **/
+	private String topicHeatFactor;
+	
+	/** 热门话题仅推荐发布N小时内的话题  空值为不限制 **/
+	private Integer topicHotRecommendedTime;
 
 	/** 每用户每24小时内发送短信次数 **/
 	private Integer userSentSmsCount = 10;
@@ -743,6 +751,30 @@ public void setReportMaxImageUpload(Integer reportMaxImageUpload) {
 		this.reportMaxImageUpload = reportMaxImageUpload;
 	}
 
+	public Integer getSupportEditor() {
+		return supportEditor;
+	}
+
+	public void setSupportEditor(Integer supportEditor) {
+		this.supportEditor = supportEditor;
+	}
+
+	public String getTopicHeatFactor() {
+		return topicHeatFactor;
+	}
+
+	public void setTopicHeatFactor(String topicHeatFactor) {
+		this.topicHeatFactor = topicHeatFactor;
+	}
+
+	public Integer getTopicHotRecommendedTime() {
+		return topicHotRecommendedTime;
+	}
+
+	public void setTopicHotRecommendedTime(Integer topicHotRecommendedTime) {
+		this.topicHotRecommendedTime = topicHotRecommendedTime;
+	}
+
 
 
 

src/main/java/cms/bean/template/Forum_TopicRelated_HotTopic.java

@@ -0,0 +1,35 @@
+package cms.bean.template;
+
+import java.io.Serializable;
+
+/**
+ * 热门话题
+ *
+ */
+public class Forum_TopicRelated_HotTopic implements Serializable{
+	private static final long serialVersionUID = 5980498481240294504L;
+
+	/** 版块---话题相关--热门话题  Id **/
+	private String hotTopic_id;
+	
+	/** 显示记录数 **/
+	private Integer  hotTopic_maxResult;
+
+	public String getHotTopic_id() {
+		return hotTopic_id;
+	}
+
+	public void setHotTopic_id(String hotTopic_id) {
+		this.hotTopic_id = hotTopic_id;
+	}
+
+	public Integer getHotTopic_maxResult() {
+		return hotTopic_maxResult;
+	}
+
+	public void setHotTopic_maxResult(Integer hotTopic_maxResult) {
+		this.hotTopic_maxResult = hotTopic_maxResult;
+	}
+
+	
+}

src/main/java/cms/bean/topic/Comment.java

@@ -78,6 +78,11 @@ public class Comment implements Serializable{
 	/** 评论内容 **/
 	@Lob
 	private String content;
+	/** 是否使用Markdown **/
+	private Boolean isMarkdown;
+	/** Markdown内容 **/
+	@Lob
+	private String markdownContent;
 	/** 评论时间 **/
 	@Temporal(TemporalType.TIMESTAMP)
 	private Date postTime = new Date();
@@ -333,5 +338,25 @@ public Integer getUserInfoStatus() {
 	public void setUserInfoStatus(Integer userInfoStatus) {
 		this.userInfoStatus = userInfoStatus;
 	}
+
+
+	public Boolean getIsMarkdown() {
+		return isMarkdown;
+	}
+
+
+	public void setIsMarkdown(Boolean isMarkdown) {
+		this.isMarkdown = isMarkdown;
+	}
+
+
+	public String getMarkdownContent() {
+		return markdownContent;
+	}
+
+
+	public void setMarkdownContent(String markdownContent) {
+		this.markdownContent = markdownContent;
+	}
 
 }

src/main/java/cms/bean/topic/Topic.java

@@ -25,7 +25,7 @@
  *
  */
 @Entity
-@Table(indexes = {@Index(name="topic_idx", columnList="tagId,status"),@Index(name="topic_3_idx", columnList="userName,postTime"),@Index(name="topic_5_idx", columnList="status,sort,lastReplyTime")})
+@Table(indexes = {@Index(name="topic_idx", columnList="tagId,status"),@Index(name="topic_3_idx", columnList="userName,postTime"),@Index(name="topic_5_idx", columnList="status,sort,lastReplyTime"),@Index(name="topic_6_idx", columnList="weight")})
 public class Topic implements Serializable{
 	private static final long serialVersionUID = -684257451052921859L;
 
@@ -49,7 +49,12 @@ public class Topic implements Serializable{
 	@Lob
 	private String summary;
 
+	/** 是否使用Markdown **/
+	private Boolean isMarkdown;
 
+	/** Markdown内容 **/
+	@Lob
+	private String markdownContent;
 
 	/** 发表时间 **/
 	@Temporal(TemporalType.TIMESTAMP)
@@ -131,6 +136,9 @@ public class Topic implements Serializable{
 	/** 状态 10.待审核 20.已发布 110.待审核删除 120.已发布删除 **/
 	private Integer status = 10;
 
+	/** 权重 = P表示热度因子(评论数+点赞数+浏览数)；T表示距离发帖的时间（单位为小时）；G表示"重力因子"（gravityth power），即将帖子排名往下拉的力量，默认值为1.8;  权重小于0时表示强制下沉，不再在热门榜上显示;  超出时间限制的热门话题权重在重新计算时设置为0        KaTeX公式表示：Score = \dfrac{P-1}{(T+2)^G} **/
+	private Double weight = 0d;
+	
 	public Long getId() {
 		return id;
 	}
@@ -318,5 +326,23 @@ public Integer getUserInfoStatus() {
 	public void setUserInfoStatus(Integer userInfoStatus) {
 		this.userInfoStatus = userInfoStatus;
 	}
+	public Boolean getIsMarkdown() {
+		return isMarkdown;
+	}
+	public void setIsMarkdown(Boolean isMarkdown) {
+		this.isMarkdown = isMarkdown;
+	}
+	public String getMarkdownContent() {
+		return markdownContent;
+	}
+	public void setMarkdownContent(String markdownContent) {
+		this.markdownContent = markdownContent;
+	}
+	public Double getWeight() {
+		return weight;
+	}
+	public void setWeight(Double weight) {
+		this.weight = weight;
+	}
 
 }

src/main/java/cms/service/topic/TopicService.java

@@ -68,6 +68,17 @@ public interface TopicService extends DAO<Topic>{
 	 * @return
 	 */
 	public List<Topic> findTopicByPage(String userName,Date postTime,int firstIndex, int maxResult);
+	/**
+	 * 查询热门话题
+	 * @param maxResult 需要获取的记录数
+	 * @return
+	 */
+	public List<Topic> findHotTopic(int maxResult);
+	/**
+	 * 查询热门话题 - 缓存
+	 * @return
+	 */
+	public List<Topic> findHotTopic_cache(int maxResult);
 	/**
 	 * 保存话题
 	 * @param topic
@@ -129,6 +140,12 @@ public interface TopicService extends DAO<Topic>{
 	 * @return
 	 */
 	public int addViewCount(Map<Long,Long> countMap);
+	/**
+	 * 增加权重
+	 * @param countMap key: 话题Id value:权重
+	 * @return
+	 */
+	public int addWeightCount(Map<Long,Double> countMap);
 	/**
 	 * 修改话题状态
 	 * @param topicId 话题Id