Explorar o código

优化参数类型转换

zhou-hao %!s(int64=4) %!d(string=hai) anos
pai
achega
20554909a4

+ 8 - 4
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") {