From 49d9033815db92e04c615994029f0fccdb9b9fdf Mon Sep 17 00:00:00 2001 From: Li Jinzhao Date: Tue, 30 Apr 2024 17:22:26 +0800 Subject: [PATCH] Fix wrong "Realtime - Interval" query in alarms table widget --- .../dao/sql/query/DefaultAlarmQueryRepository.java | 9 +++++++-- ui-ngx/src/app/core/api/alarm-data-subscription.ts | 3 +++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultAlarmQueryRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultAlarmQueryRepository.java index a711886e68..05da22f9a5 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultAlarmQueryRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultAlarmQueryRepository.java @@ -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(); diff --git a/ui-ngx/src/app/core/api/alarm-data-subscription.ts b/ui-ngx/src/app/core/api/alarm-data-subscription.ts index 80b3c58ab8..6b1e90ac63 100644 --- a/ui-ngx/src/app/core/api/alarm-data-subscription.ts +++ b/ui-ngx/src/app/core/api/alarm-data-subscription.ts @@ -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; }