Merge branch 'feature' into 'dev'

调整media_type搜索类型

See merge request !120

src/main/java/com/zhiwei/brandkbs2/common/GlobalPojo.java

@@ -66,17 +66,10 @@ public class GlobalPojo {
 
     public static final String ELSE_PLATFORM_NAME = "其他自媒体";
 
-    private static final ScheduledExecutorService updateBoot = Executors.newScheduledThreadPool(1,
-            new ThreadFactoryBuilder().setDaemon(false).setNameFormat("event-info-update").build());
-
-    @Autowired
-    EventService eventService;
-
     @PostConstruct
     public void start() {
         try {
             updatePojo("启动获取");
-            updateBoot.execute(() -> eventService.updateAllEventInfo());
         } catch (Exception e) {
             log.info("启动获取-出错", e);
         }

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

@@ -3,6 +3,7 @@ package com.zhiwei.brandkbs2.es;
 import com.zhiwei.brandkbs2.common.GenericAttribute;
 import com.zhiwei.brandkbs2.common.GlobalPojo;
 import com.zhiwei.brandkbs2.config.Constant;
+import com.zhiwei.brandkbs2.enmus.ImportantChannelEnum;
 import com.zhiwei.pushlog.tools.Tools;
 import com.zhiwei.qbjc.bean.pojo.common.MessagePlatform;
 import org.apache.commons.collections4.CollectionUtils;
@@ -100,14 +101,27 @@ public class EsQueryTools {
             // 不组装mediaTypes的情况
             nestedBoolQueryBuilder.must(cacheMapsNestedQuery(mustQuery));
         } else {
-            BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
-            mediaTypes.forEach(e -> {
-                BoolQueryBuilder mediaTypeQueryBuilder = QueryBuilders.boolQuery();
-                mediaTypeQueryBuilder.must(QueryBuilders.termQuery("brandkbs_cache_maps.channel_type.keyword", e));
-                mediaTypeQueryBuilder.must(mustQuery);
-                boolQueryBuilder.should(cacheMapsNestedQuery(mediaTypeQueryBuilder));
-            });
-            nestedBoolQueryBuilder.must(boolQueryBuilder);
+//            BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
+//            mediaTypes.forEach(e -> {
+//                BoolQueryBuilder mediaTypeQueryBuilder = QueryBuilders.boolQuery();
+//                mediaTypeQueryBuilder.must(QueryBuilders.termQuery("brandkbs_cache_maps.channel_type.keyword", e));
+//                mediaTypeQueryBuilder.must(mustQuery);
+//                boolQueryBuilder.should(cacheMapsNestedQuery(mediaTypeQueryBuilder));
+//            });
+            BoolQueryBuilder mediaTypesBoolQueryBuilder = QueryBuilders.boolQuery();
+            for (String mediaType : mediaTypes) {
+                BoolQueryBuilder mediaTypeBoolQueryBuilder = QueryBuilders.boolQuery();
+                //其他
+                if (ImportantChannelEnum.QITA.getState().equals(mediaType)) {
+                    for (String tag : ImportantChannelEnum.getAllTagExceptSpec()) {
+                        mediaTypeBoolQueryBuilder.mustNot(QueryBuilders.matchQuery("channel_tag", tag));
+                    }
+                } else {
+                    mediaTypeBoolQueryBuilder.must(QueryBuilders.matchQuery("channel_tag", mediaType));
+                }
+                mediaTypesBoolQueryBuilder.should(mediaTypeBoolQueryBuilder);
+            }
+            nestedBoolQueryBuilder.must(mediaTypesBoolQueryBuilder);
         }
         return nestedBoolQueryBuilder;
     }