From 213663268db0e2b2671a37346bf975aa51112ddc Mon Sep 17 00:00:00 2001
From: YevhenBondarenko <ybondarenko@thingsboard.io>
Date: Thu, 23 May 2024 23:45:40 +0200
Subject: [PATCH] fixed alarm rule with future ts

---
 .../java/org/thingsboard/rule/engine/profile/AlarmState.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/AlarmState.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/AlarmState.java
index f03d1e46ba..44005f9d65 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/AlarmState.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/AlarmState.java
@@ -250,8 +250,9 @@ class AlarmState {
             newAlarm.setCleared(false);
             newAlarm.setSeverity(severity);
             long startTs = dataSnapshot.getTs();
-            if (startTs == 0L) {
-                startTs = System.currentTimeMillis();
+            long currentTime = System.currentTimeMillis();
+            if (startTs == 0L || startTs > currentTime) {
+                startTs = currentTime;
             }
             newAlarm.setStartTs(startTs);
             newAlarm.setEndTs(startTs);