From 1e46100cd2c161af8640db9a29dab5637fa7b17a Mon Sep 17 00:00:00 2001 From: IrynaMatveieva Date: Mon, 17 Feb 2025 11:51:30 +0200 Subject: [PATCH] added endTs and startTs to rolling argument --- .../service/cf/ctx/state/TsRollingArgumentEntry.java | 3 ++- .../thingsboard/script/api/tbel/TbelCfTsRollingArg.java | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/TsRollingArgumentEntry.java b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/TsRollingArgumentEntry.java index 1ecf38746e..92722fb96b 100644 --- a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/TsRollingArgumentEntry.java +++ b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/TsRollingArgumentEntry.java @@ -82,7 +82,8 @@ public class TsRollingArgumentEntry implements ArgumentEntry { for (var e : tsRecords.entrySet()) { values.add(new TbelCfTsDoubleVal(e.getKey(), e.getValue())); } - return new TbelCfTsRollingArg(values); + long ts = System.currentTimeMillis(); + return new TbelCfTsRollingArg(ts - timeWindow, ts, values); } @Override diff --git a/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbelCfTsRollingArg.java b/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbelCfTsRollingArg.java index 14122bbde8..230baaee0a 100644 --- a/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbelCfTsRollingArg.java +++ b/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbelCfTsRollingArg.java @@ -27,10 +27,16 @@ import static org.thingsboard.script.api.tbel.TbelCfTsDoubleVal.OBJ_SIZE; public class TbelCfTsRollingArg implements TbelCfArg, Iterable { + @Getter + private final long startTs; + @Getter + private final long endTs; @Getter private final List values; - public TbelCfTsRollingArg(List values) { + public TbelCfTsRollingArg(long startTs, long endTs, List values) { + this.startTs = startTs; + this.endTs = endTs; this.values = Collections.unmodifiableList(values); }