From 9969bea2a8c1eab64c12a51a2d24d65e5b6c0dd0 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期一, 24 十月 2022 18:12:41 +0800
Subject: [PATCH] 日志导出乱码 日志查询导出 代码重构

---
 ycl-platform/src/main/java/com/ycl/entity/message/Message.java |   33 ++++++++++++++++++++++++---------
 1 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/entity/message/Message.java b/ycl-platform/src/main/java/com/ycl/entity/message/Message.java
index 703a1e3..6eefc8c 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/message/Message.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/message/Message.java
@@ -9,8 +9,6 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -38,19 +36,33 @@
     private Long id;
 
     /**
+     * 娑堟伅鐖剁被Id
+     */
+    @TableField("parent_id")
+    @ApiModelProperty(value = "娑堟伅鐖剁被Id")
+    private Long parentId;
+
+
+    /**
      * 鏍囬
      */
     @TableField("head")
     @ApiModelProperty(value = "鏍囬")
-    @NotBlank(message = "鏍囬涓虹┖")
     private String head;
+
+
+    /**
+     * 娓犻亾鐮�01-鍐呯珯淇�02-閭欢03-鐭俊
+     */
+    @TableField("channel_code")
+    @ApiModelProperty(value = "娓犻亾鐮�01-鍐呯珯淇�02-閭欢03-鐭俊")
+    private String channelCode;
 
     /**
      * 娑堟伅绫诲瀷
      */
     @TableField("message_type")
-    @ApiModelProperty(value = "娑堟伅绫诲瀷0-绔欏唴淇�1-閭欢2-鐭俊")
-    @NotBlank(message = "娑堟伅绫诲瀷涓虹┖")
+    @ApiModelProperty(value = "濉厖鏍忕洰缂栫爜")
     private Integer messageType;
 
     /**
@@ -58,7 +70,6 @@
      */
     @TableField("body")
     @ApiModelProperty(value = "娑堟伅浣�")
-    @NotNull(message = "娑堟伅浣撲负绌�")
     private String body;
 
     /**
@@ -66,7 +77,6 @@
      */
     @TableField("target_from")
     @ApiModelProperty(value = "鍙戦�佽��")
-    @NotNull(message = "鍙戦�佽�呬负绌�")
     private String targetFrom;
 
     /**
@@ -74,7 +84,6 @@
      */
     @TableField("target_to")
     @ApiModelProperty(value = "鎺ユ敹鑰�")
-    @NotBlank(message = "鎺ユ敹鑰呬负绌�")
     private String targetTo;
 
     /**
@@ -82,7 +91,6 @@
      */
     @TableField("message_number")
     @ApiModelProperty(value = "娑堟伅缂栧彿")
-    @NotBlank(message = "娑堟伅缂栧彿涓虹┖")
     private String messageNumber;
 
     /**
@@ -110,6 +118,13 @@
     @ApiModelProperty(value = "鐘舵��0-鏈彂甯�1-宸插彂甯�")
     private Integer status;
     /**
+     * 鏄惁鎵弿0-鏈壂鎻�1-宸叉壂鎻�
+     */
+    @TableField("is_scan")
+    @ApiModelProperty(value = "鏄惁鎵弿0-鏈壂鎻�1-宸叉壂鎻�")
+    private Integer isScan;
+
+    /**
      * 鏄惁鏌ョ湅0-鏈煡鐪�1-宸叉煡鐪�
      */
     @TableField("is_view")

--
Gitblit v1.8.0