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

UI: Improve datasource service.

Browse Source
This commit is contained in:
Igor Kulikov 2017-09-08 18:00:14 +03:00
parent e461fe919b
commit 3ef1a7d4ca
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ui/src/app/api/datasource.service.js
View File

@ -433,7 +433,7 @@ function DatasourceSubscription(datasourceSubscription, telemetryWebsocketServic
} else { } else {
prevSeries = [0, 0]; prevSeries = [0, 0];
} }
for (var time = startTime; time <= endTime; time += frequency) { for (var time = startTime; time <= endTime && (timer || history); time += frequency) {
var series = []; var series = [];
series.push(time); series.push(time);
var value = dataKey.func(time, prevSeries[1]); var value = dataKey.func(time, prevSeries[1]);
@ -485,7 +485,6 @@ function DatasourceSubscription(datasourceSubscription, telemetryWebsocketServic
if (timer) { if (timer) {
$timeout.cancel(timer); $timeout.cancel(timer);
timer = null;
} }
var key; var key;
@ -504,7 +503,7 @@ function DatasourceSubscription(datasourceSubscription, telemetryWebsocketServic
tickElapsed = tickElapsed - deltaElapsed; tickElapsed = tickElapsed - deltaElapsed;
for (key in dataKeys) { for (key in dataKeys) {
var dataKeyList = dataKeys[key]; var dataKeyList = dataKeys[key];
for (var index = 0; index < dataKeyList.length; index ++) { for (var index = 0; index < dataKeyList.length && (timer || history); index ++) {
var dataKey = dataKeyList[index]; var dataKey = dataKeyList[index];
if (!startTime) { if (!startTime) {
if (realtime) { if (realtime) {
@ -514,6 +513,10 @@ function DatasourceSubscription(datasourceSubscription, telemetryWebsocketServic
} else { } else {
startTime = datasourceSubscription.subscriptionTimewindow.startTs; startTime = datasourceSubscription.subscriptionTimewindow.startTs;
endTime = startTime + datasourceSubscription.subscriptionTimewindow.realtimeWindowMs + frequency; endTime = startTime + datasourceSubscription.subscriptionTimewindow.realtimeWindowMs + frequency;
if (datasourceSubscription.subscriptionTimewindow.aggregation.type == types.aggregation.none.value) {
var time = endTime - frequency * datasourceSubscription.subscriptionTimewindow.aggregation.limit;
startTime = Math.max(time, startTime);
}
} }
} else { } else {
startTime = datasourceSubscription.subscriptionTimewindow.fixedWindow.startTimeMs; startTime = datasourceSubscription.subscriptionTimewindow.fixedWindow.startTimeMs;
@ -524,7 +527,9 @@ function DatasourceSubscription(datasourceSubscription, telemetryWebsocketServic
generatedData.data[dataKey.name+'_'+dataKey.index] = data; generatedData.data[dataKey.name+'_'+dataKey.index] = data;
} }
} }
dataAggregator.onData(generatedData, true, history, apply); if (dataAggregator) {
dataAggregator.onData(generatedData, true, history, apply);
}
} else if (datasourceSubscription.type === types.widgetType.latest.value) { } else if (datasourceSubscription.type === types.widgetType.latest.value) {
for (key in dataKeys) { for (key in dataKeys) {
generateLatest(dataKeys[key], apply); generateLatest(dataKeys[key], apply);