Merge pull request #13013 from dashevchenko/lineChartFix
Adding threshold to time-series line chart affects data sources post-processing
This commit is contained in:
commit
b6bd1ad5db
@ -725,7 +725,12 @@ public class DefaultTbEntityDataSubscriptionService implements TbEntityDataSubsc
|
|||||||
update = new EntityDataUpdate(ctx.getCmdId(), ctx.getData(), null, ctx.getMaxEntitiesPerDataSubscription());
|
update = new EntityDataUpdate(ctx.getCmdId(), ctx.getData(), null, ctx.getMaxEntitiesPerDataSubscription());
|
||||||
ctx.setInitialDataSent(true);
|
ctx.setInitialDataSent(true);
|
||||||
} else {
|
} 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);
|
ctx.sendWsMsg(update);
|
||||||
} finally {
|
} finally {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user