From 1b316e12ad2694a77f1ea45f3214fcfb90c45393 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 20 Dec 2024 15:28:41 +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/DamAlarmRecord.java |   27 +++++++++++++++++++++++++--
 1 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/entity/DamAlarmRecord.java b/skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/entity/DamAlarmRecord.java
index 91dfcc1..4b5ebae 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/entity/DamAlarmRecord.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/entity/DamAlarmRecord.java
@@ -75,9 +75,32 @@
 	private Date createTime;
 
 	/**
-	 * 算法值
+	 * 预测算法值
 	 */
-	@ApiModelProperty(value = "算法值")
+	@ApiModelProperty(value = "预测算法值")
 	private String value;
 
+	/**
+	 * “value”属性处理后的值
+	 */
+	@ApiModelProperty(value = "value属性处理后的值")
+	private String timeValue;
+
+	/**
+	 * 回调类型 1：规则法 取generalInfo、detailInfo 2：其他算法 取value(arima预测) 3：待补充
+	 */
+	@ApiModelProperty(value = "回调类型 1：规则法 取generalInfo、detailInfo 2：其他算法 取value(arima预测) 3：待补充")
+	private Integer callbackType;
+	/**
+	 * 类型
+	 */
+	@ApiModelProperty(value = "类型")
+	private Integer type;
+
+	/**
+	 * 测点id
+	 */
+	@ApiModelProperty(value = "测点id")
+	private String stationId;
+
 }

--
Gitblit v1.9.3