fixed alarm rule with future ts

2 years ago · 213663268d
1 changed files with 3 additions and 2 deletions
--- 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);