From 1b3856e8f5431508d944a3b9c7a444dac3536bb6 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 07 一月 2020 18:14:18 +0800
Subject: [PATCH] cofig

---
 fanli/src/main/java/com/yeshi/fanli/dao/elastic/ESOrderDao.java |   17 +++++++----------
 1 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/elastic/ESOrderDao.java b/fanli/src/main/java/com/yeshi/fanli/dao/elastic/ESOrderDao.java
index d10ae20..bc76e72 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/elastic/ESOrderDao.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/elastic/ESOrderDao.java
@@ -7,11 +7,8 @@
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.RequestOptions;
-import org.elasticsearch.common.unit.Fuzziness;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.SearchHits;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
@@ -33,12 +30,12 @@
 	 */
 	public List<ESOrder> query(String key, String uid, List<Integer> listPlatform) {
 		List<ESOrder> list = new ArrayList<ESOrder>();
-		// 鍟嗗搧鍚嶇О鍖归厤
-		BoolQueryBuilder should1 = QueryBuilders.boolQuery().should(QueryBuilders.matchPhraseQuery("orderNo", key))
-				.should(QueryBuilders.matchPhraseQuery("goodsName", key));
+		// 鍟嗗搧鍚嶇О妯$硦鍏ㄨ瘝鍖归厤
+		BoolQueryBuilder should1 = QueryBuilders.boolQuery().should(QueryBuilders.wildcardQuery("orderNo.keyword", "*" + key + "*"))
+				.should(QueryBuilders.wildcardQuery("goodsName.keyword", "*" + key + "*"));
 		// 鐢ㄦ埛id鍖归厤
-		BoolQueryBuilder should2 = QueryBuilders.boolQuery().should(QueryBuilders.termQuery("uid", uid))
-				.should(QueryBuilders.termQuery("uidDirect", uid)).should(QueryBuilders.termQuery("uidDirect", uid));
+		BoolQueryBuilder should2 = QueryBuilders.boolQuery().should(QueryBuilders.termQuery("uid", uid));
+				//.should(QueryBuilders.termQuery("uidDirect", uid)).should(QueryBuilders.termQuery("uidDirect", uid));
 
 		// 鏌ヨ鍒涘缓
 		SearchSourceBuilder sourceBuilder = new SearchSourceBuilder();
@@ -57,7 +54,7 @@
 		searchRequest.indices(getDocument(ESOrder.class));
 		searchRequest.source(sourceBuilder);
 		try {
-			SearchResponse searchResponse = client.search(searchRequest, RequestOptions.DEFAULT);
+			SearchResponse searchResponse = elasticManger.getClient().search(searchRequest, RequestOptions.DEFAULT);
 			SearchHits hits = searchResponse.getHits();
 			SearchHit[] searchHits = hits.getHits();
 			Gson gson = new Gson();
@@ -70,5 +67,5 @@
 		}
 		return list;
 	}
-
+	
 }

--
Gitblit v1.8.0