fix: 告警信息增加字段名

src/main/java/com/xydl/cac/entity/Warning.java

@@ -42,6 +42,10 @@ public class Warning {
     @Column(name = "rule_id")
     private Integer ruleId;
 
+    @ApiModelProperty("字段名")
+    @Column(name = "field")
+    private String field;
+
     @ApiModelProperty("数据采集时间")
     @Column(name = "d_time")
     private Date dTime;

src/main/java/com/xydl/cac/task/RuleCheckTask.java

@@ -74,6 +74,7 @@ public class RuleCheckTask {
                 .sensorName(sensor.getName())
                 .zsbName(sensor.getZsbName())
                 .ruleId(rule.getId())
+                .field(typePoint.getField())
                 .dTime(date)
                 .threshold(rule.getThreshold())
                 .warnValue(value)
@@ -85,8 +86,8 @@ public class RuleCheckTask {
                 .processTime(new Date())
                 .build();
         warningRepository.save(warning);
-        String str = warning.getWarnDesc() + ", 采集时间:" + dateStr + ", 当前值:" + value + " "
+        String str = warning.getZsbName() + "-" + warning.getWarnDesc()
-                + rule.getOperatorDesc() + " 阈值(" + rule.getThreshold() + ")";
+                + ", 采集时间:" + dateStr + ", 当前值:" + value + " " + warning.getTriggerDesc();
         DingTalkPushUtil.pushText(str);
     }
 

src/main/java/com/xydl/cac/util/DingTalkPushUtil.java

@@ -19,7 +19,7 @@ public class DingTalkPushUtil {
 
     public static final String CUSTOM_ROBOT_TOKEN = "e65e730cba22e320e16926fd4ff19ce787fa2162d065792bb6562c6d4a4cf328";
     public static final String SECRET = "SEC72e5fb1b4ce7f9fed55386040d599035c50f8d2a181ad66bd1277549f0716124";
-    public static final String KEY_WORD = "运维告警";
+    public static final String KEY_WORD = "运维告警: ";
 
 
     public static void pushText(String content) {