From 1dcafe5f57996c5d2d641b7a2440604482e3b59b Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Tue, 21 Apr 2020 14:10:29 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A9=BAaction=E4=B8=8D=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../community/rule/engine/model/DeviceAlarmModelParser.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/model/DeviceAlarmModelParser.java b/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/model/DeviceAlarmModelParser.java index 9b36e8eb..e4dd77ec 100644 --- a/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/model/DeviceAlarmModelParser.java +++ b/jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/model/DeviceAlarmModelParser.java @@ -13,6 +13,7 @@ import org.jetlinks.rule.engine.api.model.RuleModel; import org.jetlinks.rule.engine.api.model.RuleNodeModel; import org.jetlinks.rule.engine.model.RuleModelParserStrategy; import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; import java.util.Collections; import java.util.HashMap; @@ -91,6 +92,9 @@ public class DeviceAlarmModelParser implements RuleModelParserStrategy { if (CollectionUtils.isNotEmpty(rule.getAlarmRule().getActions())) { int index = 0; for (Action operation : rule.getAlarmRule().getActions()) { + if (!StringUtils.hasText(operation.getExecutor())) { + continue; + } RuleNodeModel action = new RuleNodeModel(); action.setId("device_alarm_action:" + index); action.setName("执行动作:" + index);