From fcd21e42fb905372fe7feb596d99029fc62ed5c9 Mon Sep 17 00:00:00 2001
From: yangzhe123 <2824096059@qq.com>
Date: Mon, 17 Nov 2025 15:40:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B3=A8=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gunshi/project/hsz/model/SyRegressionData.java     | 7 -------
 .../java/com/gunshi/project/hsz/timetask/AlarmTask.java    | 3 +++
 .../com/gunshi/project/hsz/util/RegressionAnalysis.java    | 4 ++++
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/gunshi/project/hsz/model/SyRegressionData.java b/src/main/java/com/gunshi/project/hsz/model/SyRegressionData.java
index 1b2947d..23ac86a 100644
--- a/src/main/java/com/gunshi/project/hsz/model/SyRegressionData.java
+++ b/src/main/java/com/gunshi/project/hsz/model/SyRegressionData.java
@@ -81,11 +81,4 @@ public class SyRegressionData implements Serializable {
     @Schema(description = "排序（一阶-四阶）")
     private Integer order;
 
-    /**
-    * 创建时间（如果表中有此字段可以添加）
-    */
-    @TableField(value = "create_time")
-    @Schema(description = "创建时间")
-    @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8")
-    private Date createTime;
 }
\ No newline at end of file
diff --git a/src/main/java/com/gunshi/project/hsz/timetask/AlarmTask.java b/src/main/java/com/gunshi/project/hsz/timetask/AlarmTask.java
index fe848ef..8f29463 100644
--- a/src/main/java/com/gunshi/project/hsz/timetask/AlarmTask.java
+++ b/src/main/java/com/gunshi/project/hsz/timetask/AlarmTask.java
@@ -147,6 +147,9 @@ public class AlarmTask {
                 return;
             }else{
                 BigDecimal rz =stRiverRReal.getZ();
+                if(rz == null){
+                    return;
+                }
                 if(rz.compareTo(warnWaterLevel) >=0 && rz.compareTo(promiseWaterLevel) <=0){
                     BigDecimal gap = rz.subtract(warnWaterLevel);
                     //河道超警戒
diff --git a/src/main/java/com/gunshi/project/hsz/util/RegressionAnalysis.java b/src/main/java/com/gunshi/project/hsz/util/RegressionAnalysis.java
index 76830fc..d94b0cf 100644
--- a/src/main/java/com/gunshi/project/hsz/util/RegressionAnalysis.java
+++ b/src/main/java/com/gunshi/project/hsz/util/RegressionAnalysis.java
@@ -12,6 +12,10 @@ import java.util.stream.Collectors;
 
 /**
  * 回归分析工具类
+ *
+ *
+ * 库水位rz为x轴
+ * 检测值value为y轴
  */
 public class RegressionAnalysis {