From 2cba01a6b6f67cfa97d0c4e0cc589302fab817ba Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Wed, 24 Jul 2024 11:41:37 +0800
Subject: [PATCH] 查询有变形水库

---
 skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/entity/AlarmGet.java |   36 ++++++++++++++++++++++++++++++++++--
 1 files changed, 34 insertions(+), 2 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 e070916..b831361 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
@@ -1,16 +1,30 @@
 package cn.gistack.nky.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.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
 
 /**
  * 南科院判定异常查询实体类
  */
 @Data
+@TableName( value = "NKY_ALARM_GET",autoResultMap = true)
 public class AlarmGet {
 
 	/**
 	 * 主键
 	 */
+	@TableId(
+		value = "id",
+		type = IdType.ASSIGN_ID
+	)
 	private String id;
 
 	/**
@@ -24,14 +38,21 @@
 	private String pointId;
 
 	/**
-	 * 物理量id
+	 * 物理量id   type,1:渗压,2:渗流,3:X位移,4:Y位移,5:Z位移
 	 */
+
 	private String type;
 
 	/**
 	 * 数据时间
 	 */
-	private String time;
+	@DateTimeFormat(
+		pattern = "yyyy-MM-dd HH:mm:ss"
+	)
+	@JsonFormat(
+		pattern = "yyyy-MM-dd HH:mm:ss"
+	)
+	private Date time;
 
 	/**
 	 * 测量值
@@ -41,6 +62,7 @@
 	/**
 	 * 描述
 	 */
+	@TableField("\"DESC\"")
 	private String desc;
 
 	/**
@@ -71,15 +93,25 @@
 	/**
 	 * 正向阈值
 	 */
+	@TableField(value = "forward",typeHandler = FastjsonTypeHandler.class)
 	private String forward;
 
 	/**
 	 * 反向阈值
 	 */
+	@TableField(value = "\"REVERSE\"",typeHandler = FastjsonTypeHandler.class)
 	private String reverse;
 
 	/**
 	 * 系数阈值
 	 */
+	@TableField(value = "ratio",typeHandler = FastjsonTypeHandler.class)
 	private String ratio;
+
+	/**
+	 * 处置状态(1、已处置;2、未处置)
+	 */
+	private String status;
+
+	private String taskId;
 }

--
Gitblit v1.9.3