diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/elasticsearch/EsearchUtils.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/elasticsearch/EsearchUtils.java index 607ef28..1dd6e1d 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/elasticsearch/EsearchUtils.java +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/elasticsearch/EsearchUtils.java @@ -6,6 +6,7 @@ import java.util.List; import org.apache.http.HttpHost; import org.elasticsearch.client.RestClient; +import org.elasticsearch.index.query.MatchPhraseQueryBuilder; import org.elasticsearch.xcontent.XContentType; import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.delete.DeleteResponse; @@ -98,15 +99,15 @@ public class EsearchUtils { // 2.创建BoolQueryBuilder对象 BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery(); // 3.设置boolQueryBuilder条件 - //MatchPhraseQueryBuilder matchPhraseQueryBuilder = QueryBuilders.matchPhraseQuery(kmsSearchDto.getSearchKey(), kmsSearchDto.getSearchValue()); + MatchPhraseQueryBuilder matchPhraseQueryBuilder = QueryBuilders.matchPhraseQuery(kmsSearchDto.getSearchKey(), kmsSearchDto.getSearchValue()); // 4.添加查询条件到boolQueryBuilder中 - //boolQueryBuilder.must(matchPhraseQueryBuilder); - if("1".equals(kmsSearchDto.getSearchBy())) { - boolQueryBuilder.should(QueryBuilders.termsQuery(kmsSearchDto.getSearchKey(), kmsSearchDto.getSearchValue())); - } - else if("2".equals(kmsSearchDto.getSearchBy())) { - boolQueryBuilder.should(QueryBuilders.wildcardQuery(kmsSearchDto.getSearchKey(), "*" + kmsSearchDto.getSearchValue() + "*")); - } + boolQueryBuilder.must(matchPhraseQueryBuilder); +// if("1".equals(kmsSearchDto.getSearchBy())) { +// boolQueryBuilder.should(QueryBuilders.termsQuery(kmsSearchDto.getSearchKey(), kmsSearchDto.getSearchValue())); +// } +// else if("2".equals(kmsSearchDto.getSearchBy())) { +// boolQueryBuilder.should(QueryBuilders.wildcardQuery(kmsSearchDto.getSearchKey(), "*" + kmsSearchDto.getSearchValue() + "*")); +// } // 查询条件--->生成DSL查询语句 searchSourceBuilder.query(boolQueryBuilder); Integer pageNum = 1;