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

Merge pull request #10748 from cogic/master

Browse Source 
Fix wrong "Realtime - Interval" query in alarms table widget
This commit is contained in:
Igor Kulikov 2024-05-13 16:11:42 +03:00 committed by GitHub
commit c9b1d1ec89
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultAlarmQueryRepository.java
View File

@ -206,8 +206,13 @@ public class DefaultAlarmQueryRepository implements AlarmQueryRepository {
long startTs;
long endTs;
if (pageLink.getTimeWindow() > 0) {
endTs = System.currentTimeMillis();
startTs = endTs - pageLink.getTimeWindow();
if (pageLink.getStartTs() > 0) {
startTs = pageLink.getStartTs();
endTs = startTs + pageLink.getTimeWindow();
} else {
endTs = System.currentTimeMillis();
startTs = endTs - pageLink.getTimeWindow();
}
} else {
startTs = pageLink.getStartTs();
endTs = pageLink.getEndTs();

3
ui-ngx/src/app/core/api/alarm-data-subscription.ts
View File

@ -128,6 +128,9 @@ export class AlarmDataSubscription {
this.alarmDataCommand.query.pageLink.startTs = this.subsTw.fixedWindow.startTimeMs;
this.alarmDataCommand.query.pageLink.endTs = this.subsTw.fixedWindow.endTimeMs;
} else {
if (this.subsTw.startTs) {
this.alarmDataCommand.query.pageLink.startTs = this.subsTw.startTs;
}
this.alarmDataCommand.query.pageLink.timeWindow = this.subsTw.realtimeWindowMs;
}