Showing
1 changed file
with
5 additions
and
3 deletions
@@ -25,7 +25,9 @@ import lombok.extern.slf4j.Slf4j; | @@ -25,7 +25,9 @@ import lombok.extern.slf4j.Slf4j; | ||
25 | import org.thingsboard.rule.engine.api.*; | 25 | import org.thingsboard.rule.engine.api.*; |
26 | import org.thingsboard.rule.engine.api.util.DonAsynchron; | 26 | import org.thingsboard.rule.engine.api.util.DonAsynchron; |
27 | import org.thingsboard.rule.engine.api.util.TbNodeUtils; | 27 | import org.thingsboard.rule.engine.api.util.TbNodeUtils; |
28 | +import org.thingsboard.server.common.data.kv.BaseReadTsKvQuery; | ||
28 | import org.thingsboard.server.common.data.kv.BaseTsKvQuery; | 29 | import org.thingsboard.server.common.data.kv.BaseTsKvQuery; |
30 | +import org.thingsboard.server.common.data.kv.ReadTsKvQuery; | ||
29 | import org.thingsboard.server.common.data.kv.TsKvEntry; | 31 | import org.thingsboard.server.common.data.kv.TsKvEntry; |
30 | import org.thingsboard.server.common.data.kv.TsKvQuery; | 32 | import org.thingsboard.server.common.data.kv.TsKvQuery; |
31 | import org.thingsboard.server.common.data.plugin.ComponentType; | 33 | import org.thingsboard.server.common.data.plugin.ComponentType; |
@@ -81,7 +83,7 @@ public class TbGetTelemetryNode implements TbNode { | @@ -81,7 +83,7 @@ public class TbGetTelemetryNode implements TbNode { | ||
81 | ctx.tellFailure(msg, new IllegalStateException("Telemetry is not selected!")); | 83 | ctx.tellFailure(msg, new IllegalStateException("Telemetry is not selected!")); |
82 | } else { | 84 | } else { |
83 | try { | 85 | try { |
84 | - List<TsKvQuery> queries = buildQueries(); | 86 | + List<ReadTsKvQuery> queries = buildQueries(); |
85 | ListenableFuture<List<TsKvEntry>> list = ctx.getTimeseriesService().findAll(msg.getOriginator(), queries); | 87 | ListenableFuture<List<TsKvEntry>> list = ctx.getTimeseriesService().findAll(msg.getOriginator(), queries); |
86 | DonAsynchron.withCallback(list, data -> { | 88 | DonAsynchron.withCallback(list, data -> { |
87 | process(data, msg); | 89 | process(data, msg); |
@@ -95,13 +97,13 @@ public class TbGetTelemetryNode implements TbNode { | @@ -95,13 +97,13 @@ public class TbGetTelemetryNode implements TbNode { | ||
95 | } | 97 | } |
96 | 98 | ||
97 | //TODO: handle direction; | 99 | //TODO: handle direction; |
98 | - private List<TsKvQuery> buildQueries() { | 100 | + private List<ReadTsKvQuery> buildQueries() { |
99 | long ts = System.currentTimeMillis(); | 101 | long ts = System.currentTimeMillis(); |
100 | long startTs = ts - startTsOffset; | 102 | long startTs = ts - startTsOffset; |
101 | long endTs = ts - endTsOffset; | 103 | long endTs = ts - endTsOffset; |
102 | 104 | ||
103 | return tsKeyNames.stream() | 105 | return tsKeyNames.stream() |
104 | - .map(key -> new BaseTsKvQuery(key, startTs, endTs, 1, limit, NONE)) | 106 | + .map(key -> new BaseReadTsKvQuery(key, startTs, endTs, 1, limit, NONE)) |
105 | .collect(Collectors.toList()); | 107 | .collect(Collectors.toList()); |
106 | } | 108 | } |
107 | 109 |