From c09ccfdc371348bc2e2fdce08c6a1b2df0975ff1 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Wed, 29 May 2024 09:55:22 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E5=A2=9E=E5=8A=A0=E5=91=8A=E8=AD=A6?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/xydl/cac/entity/Warning.java     | 12 ++++++++++++
 src/main/java/com/xydl/cac/task/RuleCheckTask.java |  3 +++
 src/main/resources/application-dev.yml             |  2 +-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/xydl/cac/entity/Warning.java b/src/main/java/com/xydl/cac/entity/Warning.java
index 301e018..d6d0800 100644
--- a/src/main/java/com/xydl/cac/entity/Warning.java
+++ b/src/main/java/com/xydl/cac/entity/Warning.java
@@ -30,6 +30,14 @@ public class Warning {
     @Column(name = "sensor_id")
     private Integer sensorId;
 
+    @ApiModelProperty("装置名称")
+    @Column(name = "sensor_name")
+    private String sensorName;
+
+    @ApiModelProperty("主设备名称")
+    @Column(name = "zsb_name")
+    private String zsbName;
+
     @ApiModelProperty("规则ID")
     @Column(name = "rule_id")
     private Integer ruleId;
@@ -54,6 +62,10 @@ public class Warning {
     @Column(name = "warn_desc")
     private String warnDesc;
 
+    @ApiModelProperty("触发信息")
+    @Column(name = "trigger_desc")
+    private String triggerDesc;
+
     @ApiModelProperty("告警级别 0:低 1:中 2:高")
     @Column(name = "warn_level")
     private Integer warnLevel;
diff --git a/src/main/java/com/xydl/cac/task/RuleCheckTask.java b/src/main/java/com/xydl/cac/task/RuleCheckTask.java
index 4aa5766..80d9ae4 100644
--- a/src/main/java/com/xydl/cac/task/RuleCheckTask.java
+++ b/src/main/java/com/xydl/cac/task/RuleCheckTask.java
@@ -71,6 +71,8 @@ public class RuleCheckTask {
         ModevTypePoint typePoint = rule.getTypePoint();
         Warning warning = Warning.builder()
                 .sensorId(sensor.getId())
+                .sensorName(sensor.getName())
+                .zsbName(sensor.getZsbName())
                 .ruleId(rule.getId())
                 .dTime(date)
                 .threshold(rule.getThreshold())
@@ -78,6 +80,7 @@ public class RuleCheckTask {
                 .warnLevel(rule.getLevel())
                 .state("1")
                 .warnDesc(sensor.getName() + " " + typePoint.getFieldDesc() + " 告警")
+                .triggerDesc(rule.getOperatorDesc() + " 阈值(" + rule.getThreshold() + ")")
                 .warnTime(new Date())
                 .processTime(new Date())
                 .build();
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index c801fcc..418b6e1 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -9,7 +9,7 @@ spring:
     time-zone: GMT+8
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.1.190:3306/cacdb?charset=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&connectTimeout=60000&socketTimeout=60000
+    url: jdbc:mysql://192.168.1.190:3306/cacdb_panlong?charset=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&connectTimeout=60000&socketTimeout=60000
     username: root
     password: 123456
   jpa: