From 5857e40d56cb212a8362740e3377955b9475a493 Mon Sep 17 00:00:00 2001 From: IrynaMatveieva Date: Mon, 27 Oct 2025 09:27:19 +0200 Subject: [PATCH] added useLatestTs check when CF updated --- .../server/service/cf/ctx/state/CalculatedFieldCtx.java | 5 +++++ .../ctx/state/aggregation/function/CountUniqueAggEntry.java | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/CalculatedFieldCtx.java b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/CalculatedFieldCtx.java index 218d03ac38..f141e750b8 100644 --- a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/CalculatedFieldCtx.java +++ b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/CalculatedFieldCtx.java @@ -574,6 +574,11 @@ public class CalculatedFieldCtx implements Closeable { if (!Objects.equals(output, other.output)) { return true; } + if (calculatedField.getConfiguration() instanceof SimpleCalculatedFieldConfiguration thisConfig + && other.calculatedField.getConfiguration() instanceof SimpleCalculatedFieldConfiguration otherConfig + && thisConfig.isUseLatestTs() != otherConfig.isUseLatestTs()) { + return true; + } if (cfType == CalculatedFieldType.ALARM) { if (!calculatedField.getName().equals(other.getCalculatedField().getName())) { return true; diff --git a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/aggregation/function/CountUniqueAggEntry.java b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/aggregation/function/CountUniqueAggEntry.java index a66cbaa6af..3c14d7c9b9 100644 --- a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/aggregation/function/CountUniqueAggEntry.java +++ b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/aggregation/function/CountUniqueAggEntry.java @@ -15,7 +15,6 @@ */ package org.thingsboard.server.service.cf.ctx.state.aggregation.function; -import org.thingsboard.common.util.JacksonUtil; import org.thingsboard.server.common.data.cf.configuration.aggregation.AggFunction; import java.util.Optional; @@ -28,7 +27,7 @@ public class CountUniqueAggEntry implements AggEntry { @Override public void update(Object value) { if (value != null) { - items.add(JacksonUtil.toString(value)); + items.add(String.valueOf(value)); } }