From 4c19ddd36bdfb43b5ef4e8df3c9a98cd4d356d6c Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 26 May 2022 10:55:04 +0800
Subject: [PATCH] 1、资讯模糊匹配修改

---
 src/main/java/org/springblade/modules/article/entity/Article.java |   47 +++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springblade/modules/article/entity/Article.java b/src/main/java/org/springblade/modules/article/entity/Article.java
index d77d7e7..5ad07f7 100644
--- a/src/main/java/org/springblade/modules/article/entity/Article.java
+++ b/src/main/java/org/springblade/modules/article/entity/Article.java
@@ -6,10 +6,10 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-
+import org.springframework.format.annotation.DateTimeFormat;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * @author zhongrj
@@ -53,13 +53,16 @@
 	 */
 	@TableField("create_time")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-	private LocalDateTime createTime;
+	@DateTimeFormat( pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date createTime;
 
 	/**
 	 * 更新时间
 	 */
 	@TableField("update_time")
-	private LocalDateTime updateTime;
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@DateTimeFormat( pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date updateTime;
 
 	/**
 	 * 发布来源id
@@ -72,4 +75,40 @@
 	 */
 	@TableField("source_name")
 	private String sourceName;
+
+	/**
+	 * 资讯类型,对应业务字典数据 articleType
+	 */
+	@TableField("article_type")
+	private String articleType;
+
+	/**
+	 * 是否推荐  1:推荐  2:不推荐
+	 */
+	private Integer recommend;
+
+	/**
+	 * 发布状态 0:未发布 1:已发布
+	 */
+	private String publish;
+
+	/**
+	 * 开启评论区 0:关闭 1:开启
+	 */
+	private String iscomment;
+
+	/**
+	 * 是否包含敏感词
+	 */
+	private String iswords;
+
+	/**
+	 * 敏感词内容
+	 */
+	@TableField("words_content")
+	private String wordsContent;
+	/**
+	 * 是否是个人
+	 */
+	private int type;
 }

--
Gitblit v1.9.3