Fix reevaluation interval for entity aggregation CFs

application/src/main/java/org/thingsboard/server/service/cf/ctx/state/CalculatedFieldCtx.java

@@ -58,6 +58,7 @@ import org.thingsboard.server.common.data.tenant.profile.DefaultTenantProfileCon
 import org.thingsboard.server.common.data.util.CollectionsUtil;
 import org.thingsboard.server.common.util.ProtoUtils;
 import org.thingsboard.server.dao.relation.RelationService;
+import org.thingsboard.server.dao.util.TimeUtils;
 import org.thingsboard.server.gen.transport.TransportProtos.CalculatedFieldTelemetryMsgProto;
 import org.thingsboard.server.service.cf.CalculatedFieldProcessingService;
 import org.thingsboard.server.service.cf.ctx.CalculatedFieldEntityCtxId;
@@ -66,6 +67,7 @@ import org.thingsboard.server.service.cf.ctx.state.geofencing.GeofencingCalculat
 import org.thingsboard.server.service.telemetry.AlarmSubscriptionService;
 
 import java.io.Closeable;
+import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -215,8 +217,13 @@ public class CalculatedFieldCtx implements Closeable {
             if (watermark != null && watermark.getDuration() > 0) {
                 return true;
             }
-            long intervalDurationMillis = entityAggregationConfig.getInterval().getCurrentIntervalDurationMillis();
-            if (now - lastReevaluationTs >= intervalDurationMillis) {
+            if (lastReevaluationTs == 0) {
+                lastReevaluationTs = now;
+                return true;
+            }
+            ZonedDateTime lastReevaluationTime = TimeUtils.toZonedDateTime(lastReevaluationTs, entityAggregationConfig.getInterval().getZoneId());
+            long previousIntervalEndTs = entityAggregationConfig.getInterval().getDateTimeIntervalEndTs(lastReevaluationTime);
+            if (now >= previousIntervalEndTs) {
                 lastReevaluationTs = now;
                 return true;
             }

dao/src/main/java/org/thingsboard/server/dao/util/TimeUtils.java

@@ -15,6 +15,8 @@
  */
 package org.thingsboard.server.dao.util;
 
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
 import org.thingsboard.server.common.data.kv.IntervalType;
 
 import java.time.Instant;
@@ -24,6 +26,7 @@ import java.time.temporal.ChronoUnit;
 import java.time.temporal.IsoFields;
 import java.time.temporal.WeekFields;
 
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class TimeUtils {
 
     public static long calculateIntervalEnd(long startTs, IntervalType intervalType, ZoneId tzId) {
@@ -42,4 +45,8 @@ public class TimeUtils {
         }
     }
 
+    public static ZonedDateTime toZonedDateTime(long ts, ZoneId zoneId) {
+        return ZonedDateTime.ofInstant(Instant.ofEpochMilli(ts), zoneId);
+    }
+
 }