From 80e6bfe4b50a1583f9a2e7ba77ca728a8bb86d89 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 04 Aug 2023 17:53:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/entity/AlarmGet.java | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/entity/AlarmGet.java b/skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/entity/AlarmGet.java
index e75812a..1c4dfb9 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/entity/AlarmGet.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/entity/AlarmGet.java
@@ -5,19 +5,26 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
-import org.springframework.data.annotation.Id;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
/**
* 南科院判定异常查询实体类
*/
@Data
-@TableName( value = "NKY_ALARM_GET")
+@TableName( value = "NKY_ALARM_GET",autoResultMap = true)
public class AlarmGet {
/**
* 主键
*/
+ @TableId(
+ value = "id",
+ type = IdType.ASSIGN_ID
+ )
private String id;
/**
@@ -38,7 +45,13 @@
/**
* 数据时间
*/
- private String time;
+ @DateTimeFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
+ private Date time;
/**
* 测量值
@@ -48,6 +61,7 @@
/**
* 描述
*/
+ @TableField("\"DESC\"")
private String desc;
/**
@@ -78,15 +92,18 @@
/**
* 正向阈值
*/
- private String forward;
+ @TableField(value = "forward",typeHandler = FastjsonTypeHandler.class)
+ private Object forward;
/**
* 反向阈值
*/
- private String reverse;
+ @TableField(value = "\"REVERSE\"",typeHandler = FastjsonTypeHandler.class)
+ private Object reverse;
/**
* 系数阈值
*/
- private String ratio;
+ @TableField(value = "ratio",typeHandler = FastjsonTypeHandler.class)
+ private Object ratio;
}
--
Gitblit v1.9.3