From db91c5a98e7133617829e29c55d7b999aabd7521 Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Wed, 13 Jan 2021 16:22:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96es7.2=E4=BB=A5=E4=B8=8A?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E7=9A=84=E8=81=9A=E5=90=88=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reactive/ReactiveAggregationService.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/service/reactive/ReactiveAggregationService.java b/jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/service/reactive/ReactiveAggregationService.java index c91bd8d8..8a41818c 100644 --- a/jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/service/reactive/ReactiveAggregationService.java +++ b/jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/service/reactive/ReactiveAggregationService.java @@ -88,17 +88,17 @@ public class ReactiveAggregationService implements AggregationService { builder.timeZone(ZoneId.systemDefault()); builder.order(BucketOrder.key(false)); if (timeGroup.getInterval() != null) { + Interval interval = timeGroup.getInterval(); + String intervalString = interval.toString(); if (restClient.serverVersion().after(Version.V_7_2_0)) { - Interval interval = timeGroup.getInterval(); - if (interval.isFixed()) { - builder.fixedInterval(new DateHistogramInterval(timeGroup.getInterval().toString())); - } else if (interval.isCalendar()) { - builder.calendarInterval(new DateHistogramInterval(timeGroup.getInterval().toString())); + if (DateHistogramAggregationBuilder.DATE_FIELD_UNITS.containsKey(intervalString)) { + builder.calendarInterval(new DateHistogramInterval(intervalString)); } else { - builder.dateHistogramInterval(new DateHistogramInterval(timeGroup.getInterval().toString())); + builder.fixedInterval(new DateHistogramInterval(intervalString)); +// builder.dateHistogramInterval(new DateHistogramInterval(intervalString)); } } else { - builder.dateHistogramInterval(new DateHistogramInterval(timeGroup.getInterval().toString())); + builder.dateHistogramInterval(new DateHistogramInterval(intervalString)); } }