Merge branch 'feature' into 'dev'

调整nested查询语句

See merge request !95

src/main/java/com/zhiwei/brandkbs2/es/EsQueryTools.java

@@ -8,10 +8,7 @@ import com.zhiwei.qbjc.bean.pojo.common.MessagePlatform;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.lucene.search.join.ScoreMode;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.NestedQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.index.query.*;
 
 import java.util.*;
 
@@ -97,30 +94,35 @@ public class EsQueryTools {
 
     public static BoolQueryBuilder assembleCacheMapsQuery(String projectId, String linkedGroupId, String contendId, List<String> mediaTypes) {
         BoolQueryBuilder nestedBoolQueryBuilder = QueryBuilders.boolQuery();
-        // must key
-        nestedBoolQueryBuilder.must(cacheMapsNestedQuery(QueryBuilders.termQuery("brandkbs_cache_maps.key.keyword", concat(projectId, contendId))));
-        // mediaType
-        if (CollectionUtils.isNotEmpty(mediaTypes)) {
-            BoolQueryBuilder mediaTypeQueryBuilder = QueryBuilders.boolQuery();
+        String key = concat(projectId, contendId);
+        TermQueryBuilder mustQuery = QueryBuilders.termQuery("brandkbs_cache_maps.key.keyword", key);
+        if (CollectionUtils.isEmpty(mediaTypes)) {
+            // 不组装mediaTypes的情况
+            nestedBoolQueryBuilder.must(cacheMapsNestedQuery(mustQuery));
+        } else {
             mediaTypes.forEach(e -> {
-                mediaTypeQueryBuilder.should(cacheMapsNestedQuery(QueryBuilders.termQuery("brandkbs_cache_maps.channel_type.keyword", e)));
+                BoolQueryBuilder mediaTypeQueryBuilder = QueryBuilders.boolQuery();
+                mediaTypeQueryBuilder.must(QueryBuilders.termQuery("brandkbs_cache_maps.channel_type.keyword", e));
+                mediaTypeQueryBuilder.must(mustQuery);
+                nestedBoolQueryBuilder.should(cacheMapsNestedQuery(mediaTypeQueryBuilder));
             });
-            nestedBoolQueryBuilder.must(mediaTypeQueryBuilder);
         }
         return nestedBoolQueryBuilder;
     }
 
     public static BoolQueryBuilder assembleCacheMapsQueryWithProject(String projectId, List<String> mediaTypes) {
         BoolQueryBuilder nestedBoolQueryBuilder = QueryBuilders.boolQuery();
-        // must key
-        nestedBoolQueryBuilder.must(cacheMapsNestedQuery(QueryBuilders.termQuery("brandkbs_cache_maps.project_id.keyword", projectId)));
-        // mediaType
-        if (CollectionUtils.isNotEmpty(mediaTypes)) {
-            BoolQueryBuilder mediaTypeQueryBuilder = QueryBuilders.boolQuery();
+        TermQueryBuilder mustQuery = QueryBuilders.termQuery("brandkbs_cache_maps.project_id.keyword", projectId);
+        if (CollectionUtils.isEmpty(mediaTypes)) {
+            // 不组装mediaTypes的情况
+            nestedBoolQueryBuilder.must(cacheMapsNestedQuery(mustQuery));
+        } else {
             mediaTypes.forEach(e -> {
-                mediaTypeQueryBuilder.should(cacheMapsNestedQuery(QueryBuilders.termQuery("brandkbs_cache_maps.channel_type.keyword", e)));
+                BoolQueryBuilder mediaTypeQueryBuilder = QueryBuilders.boolQuery();
+                mediaTypeQueryBuilder.must(QueryBuilders.termQuery("brandkbs_cache_maps.channel_type.keyword", e));
+                mediaTypeQueryBuilder.must(mustQuery);
+                nestedBoolQueryBuilder.should(cacheMapsNestedQuery(mediaTypeQueryBuilder));
             });
-            nestedBoolQueryBuilder.must(mediaTypeQueryBuilder);
         }
         return nestedBoolQueryBuilder;
     }