From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求
---
fanli/src/main/java/com/yeshi/fanli/dao/elastic/ESOrderDao.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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 bc76e72..83ba2d6 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
@@ -3,10 +3,12 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import java.util.concurrent.TimeUnit;
import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.index.query.BoolQueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.search.SearchHit;
@@ -31,25 +33,31 @@
public List<ESOrder> query(String key, String uid, List<Integer> listPlatform) {
List<ESOrder> list = new ArrayList<ESOrder>();
// 鍟嗗搧鍚嶇О妯＄硦鍏ㄨ瘝鍖归厤
- BoolQueryBuilder should1 = QueryBuilders.boolQuery().should(QueryBuilders.wildcardQuery("orderNo.keyword", "*" + 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));
+ // .should(QueryBuilders.termQuery("uidDirect",
+ // uid)).should(QueryBuilders.termQuery("uidDirect", uid));
// 鏌ヨ鍒涘缓
SearchSourceBuilder sourceBuilder = new SearchSourceBuilder();
-
+
if (listPlatform == null || listPlatform.size() == 0) {
sourceBuilder.query(QueryBuilders.boolQuery().must(should1).must(should2));
} else {
BoolQueryBuilder should3 = QueryBuilders.boolQuery();
- for (Integer platform: listPlatform) {
+ for (Integer platform : listPlatform) {
should3.should(QueryBuilders.termQuery("platform", platform));
}
sourceBuilder.query(QueryBuilders.boolQuery().must(should1).must(should2).must(should3));
}
-
+ // 鏈�澶ф煡璇㈡暟涓�200
+ sourceBuilder.size(200);
+ // 瓒呮椂20s
+ sourceBuilder.timeout(new TimeValue(20, TimeUnit.SECONDS));
SearchRequest searchRequest = new SearchRequest();
searchRequest.indices(getDocument(ESOrder.class));
searchRequest.source(sourceBuilder);
@@ -67,5 +75,5 @@
}
return list;
}
-
+
}
--
Gitblit v1.8.0