From f73dbcd6c21d28ab1e98840eee73c6d09bd0f929 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Tue, 27 Aug 2024 17:31:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/message/entity/MessageRecord.java | 41 ++++++++++++++++-------------------------
1 files changed, 16 insertions(+), 25 deletions(-)
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/message/entity/MessageRecord.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/message/entity/MessageRecord.java
index 8437168..0f5792f 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/message/entity/MessageRecord.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/message/entity/MessageRecord.java
@@ -1,16 +1,11 @@
package cn.gistack.sm.message.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
import lombok.Data;
+import org.springblade.core.mp.base.BaseEntity;
import java.io.Serializable;
-import java.util.Date;
/**
* 消息记录实体
@@ -19,14 +14,7 @@
*/
@Data
@TableName("sm_message_record")
-public class MessageRecord implements Serializable {
-
- /**
- * 主键id
- */
- @TableId(value = "id", type = IdType.ASSIGN_ID)
- @JsonSerialize(using = ToStringSerializer.class)
- private Long id;
+public class MessageRecord extends BaseEntity implements Serializable {
/**
* 主题
@@ -39,7 +27,7 @@
private String sender;
/**
- * 消息内容
+ * 接收人
*/
private String recipient;
@@ -49,7 +37,7 @@
private String content;
/**
- * 状态 已读，未读
+ * 状态 0未读 1已读
*/
private Integer status;
@@ -59,20 +47,23 @@
private String source;
/**
- * 创建人
+ * 水库guid
*/
- private String createUser;
+ private String resGuid;
/**
- * 创建时间
+ * 反馈
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
+ private String feedback;
/**
- * 更新时间
+ * 告警规则id
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
+ private Long alarmRuleId;
+
+ /**
+ * 告警模板id
+ */
+ private String templateId;
}
--
Gitblit v1.9.3