Merge branch 'feature' into 'dev'

标签请求匹配调整

See merge request !260

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

@@ -12,6 +12,7 @@ import org.apache.lucene.search.join.ScoreMode;
 import org.elasticsearch.index.query.*;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 import static com.zhiwei.brandkbs2.common.GenericAttribute.ES_BRANDKBS_CACHE_MAPS;
 import static com.zhiwei.brandkbs2.util.Tools.concat;
@@ -82,11 +83,15 @@ public class EsQueryTools {
      * @return
      */
     public static BoolQueryBuilder assembleTagQuery(List<String> tagIds) {
-        BoolQueryBuilder tagQuery = QueryBuilders.boolQuery();
-        tagIds.forEach(e -> {
-            tagQuery.should(QueryBuilders.termQuery("brandkbs_mark_cache_maps.unique_id.keyword", e));
+        // groupId分组处理
+        Map<String, List<String>> groupTagIds = tagIds.stream().collect(Collectors.groupingBy(tagId -> tagId.substring(0, 4)));
+        BoolQueryBuilder tagBoolQuery = QueryBuilders.boolQuery();
+        groupTagIds.forEach((group, list) -> {
+            BoolQueryBuilder tagQuery = QueryBuilders.boolQuery();
+            list.forEach(e -> tagQuery.should(QueryBuilders.termQuery("brandkbs_mark_cache_maps.unique_id.keyword", e)));
+            tagBoolQuery.must(tagQuery);
         });
-        return tagQuery;
+        return tagBoolQuery;
     }
 
     public static BoolQueryBuilder assembleCacheMapsQuery(String projectId, String linkedGroupId, String contendId) {

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

@@ -1041,7 +1041,7 @@ public class ChannelServiceImpl implements ChannelService {
 		Long endTime = timeRangeWeek[1];
 		String contendId = Constant.PRIMARY_CONTEND_ID;
 		JSONObject result = getSpreadingTend(channelId, type,contendId, startTime, endTime);
-		if ("稿件".equals(type)) {
+		if (!"事件".equals(type)) {
 			List<ChannelIndex.Article> dataList = getSourceContendMap(channelId, Collections.singletonList(contendId),startTime,endTime).get(contendId);
 			int dataSize = dataList.size();
 			long positiveArticle = dataList.stream().filter(data -> EmotionEnum.POSITIVE.getState() == data.getEmotion()).count();
@@ -1061,7 +1061,7 @@ public class ChannelServiceImpl implements ChannelService {
 					}, esSearchExecutor)).collect(Collectors.toList());
 			CompletableFuture.allOf(futureList.toArray(new CompletableFuture[0])).join();
 			result.put("recentlyArticles", futureList.stream().map(CompletableFuture::join).collect(Collectors.toList()));
-		} else if ("事件".equals(type)) {
+		} else {
 			Map<Long,List<Event>> eventMap = eventMiddlewareDao.getEventDay(new ChannelIndex(channelDao.findOneById(channelId), contendId).getFid(), startTime,
 					endTime);
 			List<Event> events = new ArrayList<>();