Browse Source

Fixed generation of startTs for new alarms in AlarmCalculatedFieldState

pull/14630/head
dshvaika 9 months ago
parent
commit
0bd2651f22
  1. 2
      application/src/main/java/org/thingsboard/server/service/cf/ctx/state/BaseCalculatedFieldState.java
  2. 2
      application/src/main/java/org/thingsboard/server/service/cf/ctx/state/alarm/AlarmCalculatedFieldState.java

2
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

2
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;

Loading…
Cancel
Save