perf: 优化告警信息

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

@@ -142,7 +142,7 @@ public class WarnRule {
                 if (r) {
                     result = new ArrayList<>();
                     TriggerModel model = new TriggerModel();
-                    model.setDate(new Date());
+                    model.setLastDTime(lastDTime);
                     model.setValue(String.valueOf(actualComp.getHours()));
                     result.add(model);
                 }
@@ -156,7 +156,7 @@ public class WarnRule {
                 boolean r = this.triggerRule(value);
                 if (r) {
                     TriggerModel model = new TriggerModel();
-                    model.setDate(lastDTime);
+                    model.setDTime(lastDTime);
                     model.setValue(String.valueOf(value));
                     result.add(model);
                 }

src/main/java/com/xydl/cac/model/TriggerModel.java

@@ -6,6 +6,7 @@ import java.util.Date;
 
 @Data
 public class TriggerModel {
-    private Date date;
+    private Date lastDTime;
+    private Date dTime;
     private String value;
 }

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

@@ -76,7 +76,7 @@ public class RuleCheckTask {
                 .zsbName(sensor.getZsbName())
                 .ruleId(rule.getId())
                 .field(typePoint.getField())
-                .dTime(model.getDate())
+                .dTime(model.getDTime())
                 .threshold(rule.getThreshold())
                 .warnValue(model.getValue())
                 .warnLevel(rule.getLevel())
@@ -87,8 +87,14 @@ public class RuleCheckTask {
                 .processTime(new Date())
                 .build();
         warningRepository.save(warning);
-        String str = warning.getZsbName() + "-" + warning.getWarnDesc()
+        String str = warning.getZsbName() + "--" + warning.getWarnDesc() + " "
-                + ", 采集时间:" + DateUtil.format(model.getDate()) + ", 当前值:" + model.getValue() + " " + warning.getTriggerDesc();
+                + warning.getTriggerDesc() + ", 当前值:" + model.getValue();
+        if (model.getDTime() != null) {
+            str = str + ", 采集时间:" + DateUtil.format(model.getDTime());
+        }
+        if (model.getLastDTime() != null) {
+            str = str + ", 最后采集时间:" + DateUtil.format(model.getLastDTime());
+        }
         log.warn("触发规则告警: " + str);
         webSocketServer.sendMessage(str);
         dingTalkPushUtil.pushText(str);