From 4b13647556c777f21242a2be4b666dcc4e76e608 Mon Sep 17 00:00:00 2001 From: yusufc Date: Thu, 27 Aug 2020 18:33:44 +0300 Subject: [PATCH] - Alarm option is added to switch nodes in rule engine. --- .../filter/TbOriginatorTypeFilterNodeConfiguration.java | 2 +- .../rule/engine/filter/TbOriginatorTypeSwitchNode.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeFilterNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeFilterNodeConfiguration.java index fbd3ed2e45..e64a00e600 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeFilterNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeFilterNodeConfiguration.java @@ -31,7 +31,7 @@ public class TbOriginatorTypeFilterNodeConfiguration implements NodeConfiguratio public TbOriginatorTypeFilterNodeConfiguration defaultConfiguration() { TbOriginatorTypeFilterNodeConfiguration configuration = new TbOriginatorTypeFilterNodeConfiguration(); configuration.setOriginatorTypes(Arrays.asList( - EntityType.DEVICE + EntityType.ALARM )); return configuration; } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeSwitchNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeSwitchNode.java index 20ee85d133..82764790a0 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeSwitchNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeSwitchNode.java @@ -27,7 +27,7 @@ import org.thingsboard.server.common.msg.TbMsg; type = ComponentType.FILTER, name = "originator type switch", configClazz = EmptyNodeConfiguration.class, - relationTypes = {"Device", "Asset", "Entity View", "Tenant", "Customer", "User", "Dashboard", "Rule chain", "Rule node"}, + relationTypes = {"Device", "Asset", "Alarm", "Entity View", "Tenant", "Customer", "User", "Dashboard", "Rule chain", "Rule node"}, nodeDescription = "Route incoming messages by Message Originator Type", nodeDetails = "Routes messages to chain according to the originator type ('Device', 'Asset', etc.).", uiResources = {"static/rulenode/rulenode-core-config.js"}, @@ -73,6 +73,9 @@ public class TbOriginatorTypeSwitchNode implements TbNode { case RULE_NODE: relationType = "Rule node"; break; + case ALARM: + relationType = "Alarm"; + break; default: throw new TbNodeException("Unsupported originator type: " + originatorType); }