Browse Source
Merge pull request #10860 from YevhenBondarenko/fix/alarm-rules
fixed alarm rule with future ts
pull/10876/head
Andrew Shvayka
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with
3 additions and
2 deletions
-
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.setCleared(false); |
|
|
newAlarm.setSeverity(severity); |
|
|
newAlarm.setSeverity(severity); |
|
|
long startTs = dataSnapshot.getTs(); |
|
|
long startTs = dataSnapshot.getTs(); |
|
|
if (startTs == 0L) { |
|
|
long currentTime = System.currentTimeMillis(); |
|
|
startTs = System.currentTimeMillis(); |
|
|
if (startTs == 0L || startTs > currentTime) { |
|
|
|
|
|
startTs = currentTime; |
|
|
} |
|
|
} |
|
|
newAlarm.setStartTs(startTs); |
|
|
newAlarm.setStartTs(startTs); |
|
|
newAlarm.setEndTs(startTs); |
|
|
newAlarm.setEndTs(startTs); |
|
|
|
