Merge branch 'feature' into 'release'

Feature

See merge request !98

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

@@ -18,6 +18,7 @@ public class GenericAttribute {
 //  public static final String ES_INDEX_TEST = "brandkbs2_test";
     public static final String ES_INDEX_TEST = "brandkbs2_2022";
     public static final String ES_CHANNEL_INDEX_TEST = "brandkbs2_channel_record_test";
+    public static final String ES_CHANNEL_INDEX_PREFIX = "brandkbs2_channel_record_";
     /**
      * es ind_title
      **/

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

@@ -23,6 +23,7 @@ import org.springframework.stereotype.Component;
 import javax.annotation.Resource;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -109,13 +110,12 @@ public class ChannelEsDao extends EsClientDao {
 
     public String getChannelRecordIndex() {
 //        if (test) {
-        return GenericAttribute.ES_CHANNEL_INDEX_TEST;
+//        return GenericAttribute.ES_CHANNEL_INDEX_TEST;
 //        }
-//        // 近1年数据库 TODO
-//        Calendar date = Calendar.getInstance();
-//        int year = date.get(Calendar.YEAR);
-//        res.add(GenericAttribute.ES_CHANNEL_INDEX_TEST);
-//        return res.toArray(new String[0]);
+        // 近1年数据库
+        Calendar date = Calendar.getInstance();
+        int year = date.get(Calendar.YEAR);
+        return GenericAttribute.ES_CHANNEL_INDEX_PREFIX + year;
     }
 
     private BoolQueryBuilder channelUniqueBool(String fid) {

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,39 @@ 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 {
+            BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
             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);
+                boolQueryBuilder.should(cacheMapsNestedQuery(mediaTypeQueryBuilder));
             });
-            nestedBoolQueryBuilder.must(mediaTypeQueryBuilder);
+            nestedBoolQueryBuilder.must(boolQueryBuilder);
         }
         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 {
+            BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
             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);
+                boolQueryBuilder.should(cacheMapsNestedQuery(mediaTypeQueryBuilder));
             });
-            nestedBoolQueryBuilder.must(mediaTypeQueryBuilder);
+            nestedBoolQueryBuilder.must(boolQueryBuilder);
         }
         return nestedBoolQueryBuilder;
     }

src/main/java/com/zhiwei/brandkbs2/service/impl/ChannelServiceImpl.java

@@ -751,7 +751,7 @@ public class ChannelServiceImpl implements ChannelService {
             boolean isPositive = false;
             boolean isNegative = false;
             long specNegativeCount = eventDao.getEventCount(new ChannelIndex(channel), Arrays.asList(EmotionEnum.POSITIVE.getName(), EmotionEnum.NEUTRAL.getName()), EmotionEnum.NEGATIVE.getName());
-            long specPositiveCount = eventDao.getEventCount(new ChannelIndex(channel), Arrays.asList(EmotionEnum.NEGATIVE.getName(), EmotionEnum.POSITIVE.getName()), EmotionEnum.POSITIVE.getName());
+            long specPositiveCount = eventDao.getEventCount(new ChannelIndex(channel), Collections.singletonList(EmotionEnum.NEGATIVE.getName()), EmotionEnum.POSITIVE.getName());
             // 特殊情况:若皆有发布过反常稿件
             if (specNegativeCount > 0 && specPositiveCount > 0) {
                 //正面稿件数>负面稿件数，为正面

src/test/java/com/zhiwei/brandkbs2/BrandkbsIndexCreateTest.java

@@ -30,9 +30,9 @@ public class BrandkbsIndexCreateTest {
     public void test1() throws IOException {
         String channelIndex = "brandkbs2_channel_record_2023";
 //          String brandkbsIndex = "brandkbs2_2022";
-//          putChannelIndex(channelIndex);
+          putChannelIndex(channelIndex);
 //        putBrandkbsIndex("brandkbs2_2018","brandkbs2_2019","brandkbs2_2020","brandkbs2_2021");
-          putBrandkbsIndex("brandkbs2_2017");
+//          putBrandkbsIndex("brandkbs2_2017");
     }
 
     public void putChannelIndex(String... indexes) throws IOException {
@@ -219,7 +219,7 @@ public class BrandkbsIndexCreateTest {
         builder(obj2, "long", "time", false);
         builder(obj2, "long", "last_time", false);
         message.put("properties", obj2);
-        properties.put("mark_cache_maps", message);
+        properties.put("record", message);
     }
 
     public static void markMapCache(Map<String, Object> properties) {