From 08654185ca2a99d6b7c4760dd7179cde22304791 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Tue, 10 Dec 2024 11:34:29 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=91=8A=E8=AD=A6=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E4=B8=B2=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/upgrade1210.sql                                           | 1 +
 src/main/java/com/xydl/cac/entity/WarnRule.java              | 4 ++++
 .../java/com/xydl/cac/service/impl/WarnRuleServiceImpl.java  | 1 +
 src/main/java/com/xydl/cac/task/RuleCheckTask.java           | 5 +++++
 4 files changed, 11 insertions(+)
 create mode 100644 db/upgrade1210.sql

diff --git a/db/upgrade1210.sql b/db/upgrade1210.sql
new file mode 100644
index 0000000..9c613ee
--- /dev/null
+++ b/db/upgrade1210.sql
@@ -0,0 +1 @@
+ALTER TABLE `warn_rule` ADD COLUMN `notify_com` INT(11) NULL DEFAULT NULL COMMENT '0:不通知; 1:通知' AFTER `active`;
diff --git a/src/main/java/com/xydl/cac/entity/WarnRule.java b/src/main/java/com/xydl/cac/entity/WarnRule.java
index 9464296..9bfac57 100644
--- a/src/main/java/com/xydl/cac/entity/WarnRule.java
+++ b/src/main/java/com/xydl/cac/entity/WarnRule.java
@@ -77,6 +77,10 @@ public class WarnRule {
     @Column(name = "active")
     private Integer active;
 
+    @ApiModelProperty("状态 0:不通知 1:通知")
+    @Column(name = "notify_com")
+    private Integer notifyCom;
+
     @ApiModelProperty("最后数据采集时间")
     @Column(name = "last_d_time")
     private Date lastDTime;
diff --git a/src/main/java/com/xydl/cac/service/impl/WarnRuleServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/WarnRuleServiceImpl.java
index dd00896..acdeec2 100644
--- a/src/main/java/com/xydl/cac/service/impl/WarnRuleServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/WarnRuleServiceImpl.java
@@ -86,6 +86,7 @@ public class WarnRuleServiceImpl implements WarnRuleService {
         rule.setThreshold(item.getThreshold());
         rule.setLevel(item.getLevel());
         rule.setActive(item.getActive());
+        rule.setNotifyCom(item.getNotifyCom());
         repository.save(rule);
         StaticVariable.rule_Cache.remove(rule.getId());
     }
diff --git a/src/main/java/com/xydl/cac/task/RuleCheckTask.java b/src/main/java/com/xydl/cac/task/RuleCheckTask.java
index d7a7b5d..c12159b 100644
--- a/src/main/java/com/xydl/cac/task/RuleCheckTask.java
+++ b/src/main/java/com/xydl/cac/task/RuleCheckTask.java
@@ -4,6 +4,7 @@ import com.xydl.cac.entity.ModevTypePoint;
 import com.xydl.cac.entity.NSensor;
 import com.xydl.cac.entity.WarnRule;
 import com.xydl.cac.entity.Warning;
+import com.xydl.cac.entity.constants.Constants;
 import com.xydl.cac.model.StaticVariable;
 import com.xydl.cac.model.TriggerModel;
 import com.xydl.cac.repository.WarnRuleRepository;
@@ -73,6 +74,10 @@ public class RuleCheckTask {
                 for (TriggerModel model : warnList) {
                     this.sendWarning(rule, model);
                 }
+                if (rule.getNotifyCom() != null && rule.getNotifyCom().intValue() == Constants.TRUE) {
+                    // 通知串口
+
+                }
             }
         } catch (Exception e) {
             log.error("RuleCheckTask.ruleCheck error.", e);