From f4fb93a40da27c3f46f6f5d399cd34ffbd948769 Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Wed, 21 Oct 2020 12:03:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../community/elastic/search/enums/TermTypeEnum.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/enums/TermTypeEnum.java b/jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/enums/TermTypeEnum.java index c51f414d..3386ed12 100644 --- a/jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/enums/TermTypeEnum.java +++ b/jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/enums/TermTypeEnum.java @@ -6,6 +6,7 @@ import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.index.query.QueryBuilders; import org.hswebframework.ezorm.core.param.Term; import org.jetlinks.community.elastic.search.utils.TermCommonUtils; +import org.jetlinks.reactor.ql.utils.CastUtils; import org.springframework.util.StringUtils; import java.util.Arrays; @@ -38,10 +39,10 @@ public enum TermTypeEnum { Object and = null; List values = TermCommonUtils.convertToList(term.getValue()); if (values.size() > 0) { - between = values.get(0); + between = CastUtils.castNumber(values.get(0)); } if (values.size() > 1) { - and = values.get(1); + and = CastUtils.castNumber(values.get(1)); } return QueryBuilders.rangeQuery(term.getColumn().trim()).gte(between).lte(and); } From 20554909a4bb5495134c94645e6404865989633d Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Wed, 21 Oct 2020 12:04:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../community/elastic/search/enums/TermTypeEnum.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/enums/TermTypeEnum.java b/jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/enums/TermTypeEnum.java index 3386ed12..7c43f8bc 100644 --- a/jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/enums/TermTypeEnum.java +++ b/jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/enums/TermTypeEnum.java @@ -50,25 +50,29 @@ public enum TermTypeEnum { gt("gt") { @Override public QueryBuilder process(Term term) { - return QueryBuilders.rangeQuery(term.getColumn().trim()).gt(term.getValue()); + Object value = CastUtils.castNumber(term.getValue()); + return QueryBuilders.rangeQuery(term.getColumn().trim()).gt(value); } }, gte("gte") { @Override public QueryBuilder process(Term term) { - return QueryBuilders.rangeQuery(term.getColumn().trim()).gte(term.getValue()); + Object value = CastUtils.castNumber(term.getValue()); + return QueryBuilders.rangeQuery(term.getColumn().trim()).gte(value); } }, lt("lt") { @Override public QueryBuilder process(Term term) { - return QueryBuilders.rangeQuery(term.getColumn().trim()).lt(term.getValue()); + Object value = CastUtils.castNumber(term.getValue()); + return QueryBuilders.rangeQuery(term.getColumn().trim()).lt(value); } }, lte("lte") { @Override public QueryBuilder process(Term term) { - return QueryBuilders.rangeQuery(term.getColumn().trim()).lte(term.getValue()); + Object value = CastUtils.castNumber(term.getValue()); + return QueryBuilders.rangeQuery(term.getColumn().trim()).lte(value); } }, in("in") {