diff --git a/jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/aggreation/DefaultAggregationService.java b/jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/aggreation/DefaultAggregationService.java index 08030245..c26796ec 100644 --- a/jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/aggreation/DefaultAggregationService.java +++ b/jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/aggreation/DefaultAggregationService.java @@ -7,7 +7,7 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.client.RequestOptions; -import org.elasticsearch.search.aggregations.bucket.histogram.ExtendedBounds; +import org.elasticsearch.search.aggregations.bucket.histogram.LongBounds; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.hswebframework.ezorm.core.param.QueryParam; import org.hswebframework.ezorm.core.param.TermType; @@ -27,7 +27,6 @@ import org.jetlinks.community.elastic.search.utils.ElasticSearchConverter; import org.jetlinks.community.elastic.search.utils.ReactorActionListener; import org.jetlinks.community.timeseries.query.AggregationQueryParam; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.core.publisher.MonoSink; @@ -240,8 +239,8 @@ public class DefaultAggregationService implements AggregationService { return structure; } - protected static ExtendedBounds getExtendedBounds(AggregationQueryParam param) { - return new ExtendedBounds(calculateStartWithTime(param), param.getEndWithTime()); + protected static LongBounds getExtendedBounds(AggregationQueryParam param) { + return new LongBounds(calculateStartWithTime(param), param.getEndWithTime()); } private static long calculateStartWithTime(AggregationQueryParam param) { diff --git a/jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/aggreation/bucket/BucketAggregationsStructure.java b/jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/aggreation/bucket/BucketAggregationsStructure.java index d1d883cc..7ddef780 100644 --- a/jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/aggreation/bucket/BucketAggregationsStructure.java +++ b/jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/aggreation/bucket/BucketAggregationsStructure.java @@ -1,7 +1,7 @@ package org.jetlinks.community.elastic.search.aggreation.bucket; import lombok.*; -import org.elasticsearch.search.aggregations.bucket.histogram.ExtendedBounds; +import org.elasticsearch.search.aggregations.bucket.histogram.LongBounds; import org.hswebframework.utils.StringUtils; import org.jetlinks.community.elastic.search.aggreation.enums.BucketType; import org.jetlinks.community.elastic.search.aggreation.metrics.MetricsAggregationStructure; @@ -37,7 +37,7 @@ public class BucketAggregationsStructure { private List ranges; - private ExtendedBounds extendedBounds; + private LongBounds extendedBounds; /** * 时间格式 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 8a41818c..45b27d77 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 @@ -10,8 +10,8 @@ import org.elasticsearch.search.aggregations.Aggregations; import org.elasticsearch.search.aggregations.BucketOrder; import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder; import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval; -import org.elasticsearch.search.aggregations.bucket.histogram.ExtendedBounds; import org.elasticsearch.search.aggregations.bucket.histogram.Histogram; +import org.elasticsearch.search.aggregations.bucket.histogram.LongBounds; import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder; import org.elasticsearch.search.aggregations.metrics.NumericMetricsAggregation; @@ -293,9 +293,9 @@ public class ReactiveAggregationService implements AggregationService { return queryParam; } - protected static ExtendedBounds getExtendedBounds(AggregationQueryParam param) { + protected static LongBounds getExtendedBounds(AggregationQueryParam param) { - return new ExtendedBounds(calculateStartWithTime(param), param.getEndWithTime()); + return new LongBounds(calculateStartWithTime(param), param.getEndWithTime()); } //聚合查询默认的时间间隔 diff --git a/pom.xml b/pom.xml index 8db6e176..aa080252 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ Arabba-SR7 3.8.5 4.1.51.Final - 7.9.2 + 7.10.2 1.0.0 1.0.9 1.2.70 @@ -259,12 +259,6 @@ ${jetlinks.version} - - com.google.guava - guava - 29.0-jre - - io.vertx vertx-core