Commit 3eeb405e by shenjunjie

调整nested查询语句2

parent 302813b8
...@@ -100,12 +100,14 @@ public class EsQueryTools { ...@@ -100,12 +100,14 @@ public class EsQueryTools {
// 不组装mediaTypes的情况 // 不组装mediaTypes的情况
nestedBoolQueryBuilder.must(cacheMapsNestedQuery(mustQuery)); nestedBoolQueryBuilder.must(cacheMapsNestedQuery(mustQuery));
} else { } else {
BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
mediaTypes.forEach(e -> { mediaTypes.forEach(e -> {
BoolQueryBuilder mediaTypeQueryBuilder = QueryBuilders.boolQuery(); BoolQueryBuilder mediaTypeQueryBuilder = QueryBuilders.boolQuery();
mediaTypeQueryBuilder.must(QueryBuilders.termQuery("brandkbs_cache_maps.channel_type.keyword", e)); mediaTypeQueryBuilder.must(QueryBuilders.termQuery("brandkbs_cache_maps.channel_type.keyword", e));
mediaTypeQueryBuilder.must(mustQuery); mediaTypeQueryBuilder.must(mustQuery);
nestedBoolQueryBuilder.should(cacheMapsNestedQuery(mediaTypeQueryBuilder)); boolQueryBuilder.should(cacheMapsNestedQuery(mediaTypeQueryBuilder));
}); });
nestedBoolQueryBuilder.must(boolQueryBuilder);
} }
return nestedBoolQueryBuilder; return nestedBoolQueryBuilder;
} }
...@@ -117,12 +119,14 @@ public class EsQueryTools { ...@@ -117,12 +119,14 @@ public class EsQueryTools {
// 不组装mediaTypes的情况 // 不组装mediaTypes的情况
nestedBoolQueryBuilder.must(cacheMapsNestedQuery(mustQuery)); nestedBoolQueryBuilder.must(cacheMapsNestedQuery(mustQuery));
} else { } else {
BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
mediaTypes.forEach(e -> { mediaTypes.forEach(e -> {
BoolQueryBuilder mediaTypeQueryBuilder = QueryBuilders.boolQuery(); BoolQueryBuilder mediaTypeQueryBuilder = QueryBuilders.boolQuery();
mediaTypeQueryBuilder.must(QueryBuilders.termQuery("brandkbs_cache_maps.channel_type.keyword", e)); mediaTypeQueryBuilder.must(QueryBuilders.termQuery("brandkbs_cache_maps.channel_type.keyword", e));
mediaTypeQueryBuilder.must(mustQuery); mediaTypeQueryBuilder.must(mustQuery);
nestedBoolQueryBuilder.should(cacheMapsNestedQuery(mediaTypeQueryBuilder)); boolQueryBuilder.should(cacheMapsNestedQuery(mediaTypeQueryBuilder));
}); });
nestedBoolQueryBuilder.must(boolQueryBuilder);
} }
return nestedBoolQueryBuilder; return nestedBoolQueryBuilder;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment