Showing
2 changed files
with
11 additions
and
11 deletions
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryNode.java
renamed from
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryCertainTimeRangeNode.java
... | ... | @@ -37,8 +37,8 @@ import java.util.concurrent.TimeUnit; |
37 | 37 | import java.util.stream.Collectors; |
38 | 38 | |
39 | 39 | import static org.thingsboard.rule.engine.api.TbRelationTypes.SUCCESS; |
40 | -import static org.thingsboard.rule.engine.metadata.TbGetTelemetryCertainTimeRangeNodeConfiguration.FETCH_MODE_ALL; | |
41 | -import static org.thingsboard.rule.engine.metadata.TbGetTelemetryCertainTimeRangeNodeConfiguration.MAX_FETCH_SIZE; | |
40 | +import static org.thingsboard.rule.engine.metadata.TbGetTelemetryNodeConfiguration.FETCH_MODE_ALL; | |
41 | +import static org.thingsboard.rule.engine.metadata.TbGetTelemetryNodeConfiguration.MAX_FETCH_SIZE; | |
42 | 42 | import static org.thingsboard.server.common.data.kv.Aggregation.NONE; |
43 | 43 | |
44 | 44 | /** |
... | ... | @@ -46,17 +46,17 @@ import static org.thingsboard.server.common.data.kv.Aggregation.NONE; |
46 | 46 | */ |
47 | 47 | @Slf4j |
48 | 48 | @RuleNode(type = ComponentType.ENRICHMENT, |
49 | - name = "get telemetry from certain time range", | |
50 | - configClazz = TbGetTelemetryCertainTimeRangeNodeConfiguration.class, | |
51 | - nodeDescription = "Fetch telemetry of certain time range based on the certain delay in the Message Metadata.\n", | |
49 | + name = "originator telemetry", | |
50 | + configClazz = TbGetTelemetryNodeConfiguration.class, | |
51 | + nodeDescription = "Add Message Originator Telemetry for selected time range into Message Metadata\n", | |
52 | 52 | nodeDetails = "The node allows you to select fetch mode <b>FIRST/LAST/ALL</b> to fetch telemetry of certain time range that are added into Message metadata without any prefix. " + |
53 | 53 | "If selected fetch mode <b>ALL</b> Telemetry will be added like array into Message Metadata where <b>key</b> is Timestamp and <b>value</b> is value of Telemetry. " + |
54 | 54 | "If selected fetch mode <b>FIRST</b> or <b>LAST</b> Telemetry will be added like string without Timestamp", |
55 | 55 | uiResources = {"static/rulenode/rulenode-core-config.js"}, |
56 | 56 | configDirective = "tbEnrichmentNodeGetTelemetryFromDatabase") |
57 | -public class TbGetTelemetryCertainTimeRangeNode implements TbNode { | |
57 | +public class TbGetTelemetryNode implements TbNode { | |
58 | 58 | |
59 | - private TbGetTelemetryCertainTimeRangeNodeConfiguration config; | |
59 | + private TbGetTelemetryNodeConfiguration config; | |
60 | 60 | private List<String> tsKeyNames; |
61 | 61 | private long startTsOffset; |
62 | 62 | private long endTsOffset; |
... | ... | @@ -65,7 +65,7 @@ public class TbGetTelemetryCertainTimeRangeNode implements TbNode { |
65 | 65 | |
66 | 66 | @Override |
67 | 67 | public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException { |
68 | - this.config = TbNodeUtils.convert(configuration, TbGetTelemetryCertainTimeRangeNodeConfiguration.class); | |
68 | + this.config = TbNodeUtils.convert(configuration, TbGetTelemetryNodeConfiguration.class); | |
69 | 69 | tsKeyNames = config.getLatestTsKeyNames(); |
70 | 70 | startTsOffset = TimeUnit.valueOf(config.getStartIntervalTimeUnit()).toMillis(config.getStartInterval()); |
71 | 71 | endTsOffset = TimeUnit.valueOf(config.getEndIntervalTimeUnit()).toMillis(config.getEndInterval()); | ... | ... |
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryNodeConfiguration.java
renamed from
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryCertainTimeRangeNodeConfiguration.java
... | ... | @@ -26,7 +26,7 @@ import java.util.concurrent.TimeUnit; |
26 | 26 | * Created by mshvayka on 04.09.18. |
27 | 27 | */ |
28 | 28 | @Data |
29 | -public class TbGetTelemetryCertainTimeRangeNodeConfiguration implements NodeConfiguration<TbGetTelemetryCertainTimeRangeNodeConfiguration> { | |
29 | +public class TbGetTelemetryNodeConfiguration implements NodeConfiguration<TbGetTelemetryNodeConfiguration> { | |
30 | 30 | |
31 | 31 | public static final String FETCH_MODE_FIRST = "FIRST"; |
32 | 32 | public static final String FETCH_MODE_LAST = "LAST"; |
... | ... | @@ -44,8 +44,8 @@ public class TbGetTelemetryCertainTimeRangeNodeConfiguration implements NodeConf |
44 | 44 | |
45 | 45 | |
46 | 46 | @Override |
47 | - public TbGetTelemetryCertainTimeRangeNodeConfiguration defaultConfiguration() { | |
48 | - TbGetTelemetryCertainTimeRangeNodeConfiguration configuration = new TbGetTelemetryCertainTimeRangeNodeConfiguration(); | |
47 | + public TbGetTelemetryNodeConfiguration defaultConfiguration() { | |
48 | + TbGetTelemetryNodeConfiguration configuration = new TbGetTelemetryNodeConfiguration(); | |
49 | 49 | configuration.setLatestTsKeyNames(Collections.emptyList()); |
50 | 50 | configuration.setFetchMode("FIRST"); |
51 | 51 | configuration.setStartIntervalTimeUnit(TimeUnit.MINUTES.name()); | ... | ... |