Browse Source
Merge pull request #13013 from dashevchenko/lineChartFix
Adding threshold to time-series line chart affects data sources post-processing
pull/13043/head
Viacheslav Klimov
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with
6 additions and
1 deletions
-
application/src/main/java/org/thingsboard/server/service/subscription/DefaultTbEntityDataSubscriptionService.java
|
|
|
@ -725,7 +725,12 @@ public class DefaultTbEntityDataSubscriptionService implements TbEntityDataSubsc |
|
|
|
update = new EntityDataUpdate(ctx.getCmdId(), ctx.getData(), null, ctx.getMaxEntitiesPerDataSubscription()); |
|
|
|
ctx.setInitialDataSent(true); |
|
|
|
} else { |
|
|
|
update = new EntityDataUpdate(ctx.getCmdId(), null, ctx.getData().getData(), ctx.getMaxEntitiesPerDataSubscription()); |
|
|
|
// if ctx has timeseries subscription, timeseries values are cleared after each update and is empty in ctx data,
|
|
|
|
// so to avoid sending timeseries update with empty map we set it to null
|
|
|
|
List<EntityData> preparedData = ctx.getData().getData().stream() |
|
|
|
.map(entityData -> new EntityData(entityData.getEntityId(), entityData.getLatest(), null)) |
|
|
|
.toList(); |
|
|
|
update = new EntityDataUpdate(ctx.getCmdId(), null, preparedData, ctx.getMaxEntitiesPerDataSubscription()); |
|
|
|
} |
|
|
|
ctx.sendWsMsg(update); |
|
|
|
} finally { |
|
|
|
|