Browse Source
Merge pull request #14504 from thingsboard/master-rc
Fix updateLastUpdateTimestamp for BaseCalculatedFieldState
pull/14508/head
Viacheslav Klimov
9 months ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with
1 additions and
1 deletions
-
application/src/main/java/org/thingsboard/server/service/cf/ctx/state/BaseCalculatedFieldState.java
|
|
@ -164,7 +164,7 @@ public abstract class BaseCalculatedFieldState implements CalculatedFieldState, |
|
|
newTs = singleValueArgumentEntry.getTs(); |
|
|
newTs = singleValueArgumentEntry.getTs(); |
|
|
} else if (entry instanceof TsRollingArgumentEntry tsRollingArgumentEntry) { |
|
|
} else if (entry instanceof TsRollingArgumentEntry tsRollingArgumentEntry) { |
|
|
Map.Entry<Long, Double> lastEntry = tsRollingArgumentEntry.getTsRecords().lastEntry(); |
|
|
Map.Entry<Long, Double> lastEntry = tsRollingArgumentEntry.getTsRecords().lastEntry(); |
|
|
newTs = (lastEntry != null) ? lastEntry.getKey() : System.currentTimeMillis(); |
|
|
newTs = (lastEntry != null) ? lastEntry.getKey() : DEFAULT_LAST_UPDATE_TS; |
|
|
} else if (entry instanceof RelatedEntitiesArgumentEntry relatedEntitiesArgumentEntry) { |
|
|
} else if (entry instanceof RelatedEntitiesArgumentEntry relatedEntitiesArgumentEntry) { |
|
|
newTs = relatedEntitiesArgumentEntry.getEntityInputs().values().stream() |
|
|
newTs = relatedEntitiesArgumentEntry.getEntityInputs().values().stream() |
|
|
.mapToLong(e -> (e instanceof SingleValueArgumentEntry s) ? s.getTs() : DEFAULT_LAST_UPDATE_TS) |
|
|
.mapToLong(e -> (e instanceof SingleValueArgumentEntry s) ? s.getTs() : DEFAULT_LAST_UPDATE_TS) |
|
|
|
