dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix handleGetTsCmd: add to lastTsMap

Browse Source
This commit is contained in:
ViacheslavKlimov 2022-12-13 10:57:29 +02:00
parent 606bab64bc
commit 139e5d28fb
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
application/src/main/java/org/thingsboard/server/service/subscription/DefaultTbEntityDataSubscriptionService.java
View File

@ -564,13 +564,8 @@ public class DefaultTbEntityDataSubscriptionService implements TbEntityDataSubsc
for (ReadTsKvQueryResult queryResult : queryResults) { for (ReadTsKvQueryResult queryResult : queryResults) {
String queryKey = queriesKeys.get(queryResult.getQueryId()); String queryKey = queriesKeys.get(queryResult.getQueryId());
if (queryKey != null) { if (queryKey != null) {
TsValue[] tsValues = entityData.getTimeseries().get(queryKey); entityData.getTimeseries().merge(queryKey, queryResult.toTsValues(), ArrayUtils::addAll);
if (tsValues == null) { lastTsMap.merge(queryKey, queryResult.getLastEntryTs(), Math::max);
tsValues = queryResult.toTsValues();
} else {
tsValues = ArrayUtils.addAll(tsValues, queryResult.toTsValues());
}
entityData.getTimeseries().put(queryKey, tsValues);
} else { } else {
log.warn("ReadTsKvQueryResult for {} {} has queryId not matching the initial query", log.warn("ReadTsKvQueryResult for {} {} has queryId not matching the initial query",
entityData.getEntityId().getEntityType(), entityData.getEntityId()); entityData.getEntityId().getEntityType(), entityData.getEntityId());