Merge pull request #10748 from cogic/master

Fix wrong "Realtime - Interval" query in alarms table widget
thingsboard · May 13, 2024 · c9b1d1e · c9b1d1e
2 parents 875a737 + c3bab5b
commit c9b1d1e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 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
@@ -206,8 +206,13 @@ public PageData<AlarmData> findAlarmDataByQueryForEntities(TenantId tenantId, Al
             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
@@ -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;
       }