Skip to content

Commit d03220c

Browse files
authored
Bugfix/10.2/378 overview dashboard has wrong alert value (#387)
* Bugfix -Overview-Dashboard-has-wrong-alert-value (#378)
1 parent 91d3164 commit d03220c

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

backend/src/main/java/com/park/utmstack/service/overview/OverviewService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ public List<CardType> countAlertsTodayAndLastWeek() throws DashboardOverviewExce
6767
.query(SearchUtil.toQuery(filters)).aggregations(AGG_NAME, Aggregation.of(agg -> agg
6868
.dateRange(dr -> dr.field(Constants.timestamp)
6969
.keyed(true).timeZone("UTC")
70-
.ranges(r -> r.key(TODAY_KEY).from(f -> f.expr("now/d")).from(t -> t.expr("now")))
71-
.ranges(r -> r.key(LAST_WEEK_KEY).from(f -> f.expr("now-7d/d")).from(t -> t.expr("now")))))).size(0));
70+
.ranges(r -> r.key(TODAY_KEY).from(f -> f.expr("now/d")).to(t -> t.expr("now")))
71+
.ranges(r -> r.key(LAST_WEEK_KEY).from(f -> f.expr("now-7d/d")).to(t -> t.expr("now")))))).size(0));
7272

7373
SearchResponse<String> response = elasticsearchService.search(sr, String.class);
7474
Aggregate aggregate = response.aggregations().get(AGG_NAME);

frontend/src/app/shared/components/utm/filters/elastic-filter-time/elastic-filter-time.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ export class ElasticFilterTimeComponent implements OnInit, OnChanges, OnDestroy
126126
this.dateTo = 'now';
127127
this.dateFrom = common.label;
128128
if (!this.formatInstant) {
129-
const timeFrom = ElasticTimeEnum.NOW + '-' + common.last + common.time;
129+
const timeFrom = ElasticTimeEnum.NOW + '-' + common.last + common.time + '/d' ;
130130
const timeTo = ElasticTimeEnum.NOW;
131131
this.emitElasticDate(timeFrom, timeTo);
132132
} else {

version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version: 10.2.1
1+
version: 10.2.2

0 commit comments

Comments
 (0)