suguo
/
jetlinks-community
mirror of https://gitee.com/jetlinks/jetlinks-community.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '1.5' 

# Conflicts:
#	jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/enums/TermTypeEnum.java
This commit is contained in:
zhou-hao 2020-10-21 12:05:33 +08:00
parent fdaef09362 20554909a4
commit e2b974a187
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/enums/TermTypeEnum.java
View File

@ -6,7 +6,6 @@ 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.core.metadata.types.DateTimeType;
import org.jetlinks.reactor.ql.utils.CastUtils;
import org.springframework.util.StringUtils;
@ -51,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") {