From 0bd2651f223c067d80b9b169a2bf91ccaaecdbef Mon Sep 17 00:00:00 2001
From: dshvaika <dshvaika@thingsboard.io>
Date: Wed, 17 Dec 2025 17:11:02 +0200
Subject: [PATCH] Fixed generation of startTs for new alarms in
 AlarmCalculatedFieldState

---
 .../server/service/cf/ctx/state/BaseCalculatedFieldState.java   | 2 --
 .../service/cf/ctx/state/alarm/AlarmCalculatedFieldState.java   | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/BaseCalculatedFieldState.java b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/BaseCalculatedFieldState.java
index 754fc2f6ee..09ca35cc4b 100644
--- a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/BaseCalculatedFieldState.java
+++ b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/BaseCalculatedFieldState.java
@@ -48,7 +48,6 @@ public abstract class BaseCalculatedFieldState implements CalculatedFieldState,
 
     protected Map<String, ArgumentEntry> arguments = new HashMap<>();
     protected boolean sizeExceedsLimit;
-    protected long latestTimestamp = DEFAULT_LAST_UPDATE_TS;
     protected ReadinessStatus readinessStatus;
 
     @Setter
@@ -121,7 +120,6 @@ public abstract class BaseCalculatedFieldState implements CalculatedFieldState,
         requiredArguments = null;
         arguments.clear();
         sizeExceedsLimit = false;
-        latestTimestamp = DEFAULT_LAST_UPDATE_TS;
     }
 
     @Override
diff --git a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/alarm/AlarmCalculatedFieldState.java b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/alarm/AlarmCalculatedFieldState.java
index 9dd944c2e4..4f2cbede09 100644
--- a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/alarm/AlarmCalculatedFieldState.java
+++ b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/alarm/AlarmCalculatedFieldState.java
@@ -356,7 +356,7 @@ public class AlarmCalculatedFieldState extends BaseCalculatedFieldState {
             newAlarm.setAcknowledged(false);
             newAlarm.setCleared(false);
             newAlarm.setSeverity(severity);
-            long startTs = latestTimestamp;
+            long startTs = getLatestTimestamp();
             long currentTime = System.currentTimeMillis();
             if (startTs <= 0L || startTs > currentTime) {
                 startTs = currentTime;