From 4e488ed96f0ebfa625ed6fa75de5b7c9a8c670fa Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Tue, 28 May 2024 15:21:59 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4=E5=91=8A=E8=AD=A6?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AD=97=E6=AE=B5=E5=92=8C=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xydl/cac/entity/Warning.java     | 20 +++++++++++++------
 .../java/com/xydl/cac/task/RuleCheckTask.java | 11 ++++++----
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/xydl/cac/entity/Warning.java b/src/main/java/com/xydl/cac/entity/Warning.java
index 527f49b..9c86477 100644
--- a/src/main/java/com/xydl/cac/entity/Warning.java
+++ b/src/main/java/com/xydl/cac/entity/Warning.java
@@ -27,20 +27,28 @@ public class Warning {
     private Integer id;
 
     @ApiModelProperty("装置ID")
-    @Column(name = "eqmid")
-    private Integer eqmid;
+    @Column(name = "sensor_id")
+    private Integer sensorId;
+
+    @ApiModelProperty("规则ID")
+    @Column(name = "rule_id")
+    private Integer ruleId;
+
+    @ApiModelProperty("数据采集时间")
+    @Column(name = "d_time")
+    private Date dTime;
 
     @ApiModelProperty("告警时间")
     @Column(name = "warn_time")
     private Date warnTime;
 
     @ApiModelProperty("告警值")
-    @Column(name = "warning_value")
-    private String warningValue;
+    @Column(name = "warn_value")
+    private String warnValue;
 
     @ApiModelProperty("阈值")
-    @Column(name = "threadval")
-    private String threadval;
+    @Column(name = "threshold")
+    private String threshold;
 
     @ApiModelProperty("告警信息")
     @Column(name = "warn_desc")
diff --git a/src/main/java/com/xydl/cac/task/RuleCheckTask.java b/src/main/java/com/xydl/cac/task/RuleCheckTask.java
index e0b861d..e56a7c4 100644
--- a/src/main/java/com/xydl/cac/task/RuleCheckTask.java
+++ b/src/main/java/com/xydl/cac/task/RuleCheckTask.java
@@ -69,13 +69,16 @@ public class RuleCheckTask {
         NSensor sensor = rule.getNSensor();
         ModevTypePoint typePoint = rule.getTypePoint();
         Warning warning = Warning.builder()
-                .eqmid(sensor.getDevId())
-                .threadval(rule.getThreshold())
-                .warningValue((String) value)
+                .sensorId(sensor.getId())
+                .ruleId(rule.getId())
+                .dTime(date)
+                .threshold(rule.getThreshold())
+                .warnValue((String) value)
                 .warnLevel(rule.getLevel())
                 .state("1")
                 .warnDesc(sensor.getName() + " " + typePoint.getFieldDesc() + " 告警")
-                .processTime(date)
+                .warnTime(new Date())
+                .processTime(new Date())
                 .build();
         warningRepository.save(warning);
     }