From 3de16c58350d077b555cf0fa9abb652e1086453d Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Fri, 10 May 2024 09:48:22 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E5=90=AF=E7=94=A8=E5=81=9C=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/xydl/cac/entity/WarnRule.java              | 5 +++++
 .../java/com/xydl/cac/service/impl/WarnRuleServiceImpl.java  | 2 ++
 src/main/java/com/xydl/cac/task/RuleCheckTask.java           | 4 +++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/xydl/cac/entity/WarnRule.java b/src/main/java/com/xydl/cac/entity/WarnRule.java
index 2278b2d..8bdb129 100644
--- a/src/main/java/com/xydl/cac/entity/WarnRule.java
+++ b/src/main/java/com/xydl/cac/entity/WarnRule.java
@@ -59,6 +59,11 @@ public class WarnRule {
     @Column(name = "level")
     private Integer level;
 
+    @NotNull(message = "状态不能为空")
+    @ApiModelProperty("状态 0:停用 1:启用")
+    @Column(name = "active")
+    private Integer active;
+
     @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 43e1913..d14e55a 100644
--- a/src/main/java/com/xydl/cac/service/impl/WarnRuleServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/WarnRuleServiceImpl.java
@@ -51,6 +51,7 @@ public class WarnRuleServiceImpl implements WarnRuleService {
     @Override
     public WarnRule add(WarnRule item) throws Exception {
         item.setId(null);
+        item.setLastDTime(null);
         NSensor sensor = sensorService.detail(item.getSensorId());
         Optional<ModevTypePoint> optionalModevTypePoint = typePointRepository.findById(item.getModevtypePointId());
         if (!optionalModevTypePoint.isPresent()) {
@@ -76,6 +77,7 @@ public class WarnRuleServiceImpl implements WarnRuleService {
         rule.setOperator(item.getOperator());
         rule.setThreshold(item.getThreshold());
         rule.setLevel(item.getLevel());
+        rule.setActive(item.getActive());
         repository.save(rule);
     }
 
diff --git a/src/main/java/com/xydl/cac/task/RuleCheckTask.java b/src/main/java/com/xydl/cac/task/RuleCheckTask.java
index 7c534b1..2c75832 100644
--- a/src/main/java/com/xydl/cac/task/RuleCheckTask.java
+++ b/src/main/java/com/xydl/cac/task/RuleCheckTask.java
@@ -39,7 +39,9 @@ public class RuleCheckTask {
         try {
             List<WarnRule> ruleList = ruleService.listAll();
             for (WarnRule rule : ruleList) {
-                this.ruleCheck(rule);
+                if (rule.getActive() != null && rule.getActive().intValue() == 1) {
+                    this.ruleCheck(rule);
+                }
             }
         } catch (Exception e) {
             log.error("RuleCheckTask.checkAll error.", e);