From 80a45e3d12c851d5ef0de28eab57a6c0de612eb0 Mon Sep 17 00:00:00 2001 From: IrynaMatveieva Date: Mon, 8 Dec 2025 10:46:46 +0200 Subject: [PATCH] added safe get for alarmsReevaluation interval ans intermediateAggregationInterval --- .../profile/DefaultTenantProfileConfiguration.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java index 915d97398d..0795293fa3 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java @@ -194,11 +194,13 @@ public class DefaultTenantProfileConfiguration implements TenantProfileConfigura private long minAllowedDeduplicationIntervalInSecForCF = 10; @Schema(example = "60") private long minAllowedAggregationIntervalInSecForCF = 60; + @Builder.Default @Schema(example = "300") private long intermediateAggregationIntervalInSecForCF = 300; @Builder.Default @Schema(example = "60") private long cfReevaluationCheckInterval = 60; + @Builder.Default @Schema(example = "60") private long alarmsReevaluationInterval = 60; @@ -260,4 +262,12 @@ public class DefaultTenantProfileConfiguration implements TenantProfileConfigura return cfReevaluationCheckInterval <= 0 ? 60 : cfReevaluationCheckInterval; } + public long getAlarmsReevaluationInterval() { + return alarmsReevaluationInterval <= 0 ? 60 : alarmsReevaluationInterval; + } + + public long getIntermediateAggregationIntervalInSecForCF() { + return intermediateAggregationIntervalInSecForCF <= 0 ? 300 : intermediateAggregationIntervalInSecForCF; + } + }