From be641cbe14bf20c807dccceb1c4b825d80443aed Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 08 一月 2020 14:42:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dao/elastic/ESOrderDao.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 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 ee415f0..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
@@ -33,27 +33,30 @@
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("uidIndirect", uid));
+
+ BoolQueryBuilder should2 = QueryBuilders.boolQuery().should(QueryBuilders.termQuery("uid", 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
+ // 鏈�澶ф煡璇㈡暟涓�200
sourceBuilder.size(200);
- //瓒呮椂20s
+ // 瓒呮椂20s
sourceBuilder.timeout(new TimeValue(20, TimeUnit.SECONDS));
SearchRequest searchRequest = new SearchRequest();
searchRequest.indices(getDocument(ESOrder.class));
@@ -72,5 +75,5 @@
}
return list;
}
-
+
}
--
Gitblit v1.8.0