Skip to content

B
brandkbs2
Commit b57cf324 by shenjunjie
Options

调整情报预警配置2

parent 88b936b3
Showing with 4 additions and 6 deletions
src/main/java/com/zhiwei/brandkbs2/es/EsQueryTools.java
...@@ -329,24 +329,22 @@ public class EsQueryTools { ...@@ -329,24 +329,22 @@ public class EsQueryTools {
} }
public static void addSensitiveChannel(BrandkbsYuQingConfig config, BoolQueryBuilder boolQueryBuilder) { public static void addSensitiveChannel(BrandkbsYuQingConfig config, BoolQueryBuilder boolQueryBuilder) {
BoolQueryBuilder hitBoolQuery = QueryBuilders.boolQuery();
if (!Tools.isEmpty(config.getPoliticsLevels())) { if (!Tools.isEmpty(config.getPoliticsLevels())) {
List<String> hitList = config.getPoliticsLevels(); List<String> hitList = config.getPoliticsLevels();
if (config.getPoliticsLevels().contains("全部")) { if (config.getPoliticsLevels().contains("全部")) {
hitList = ChannelType.POLITICS_LEVELS; hitList = ChannelType.POLITICS_LEVELS;
} }
BoolQueryBuilder politicsLevelBool = QueryBuilders.boolQuery(); hitList.forEach(politicsLevel -> hitBoolQuery.should(QueryBuilders.termQuery(GenericAttribute.ES_SENSITIVE_CHANNEL + "." + GenericAttribute.ES_POLITICS_LEVEL + ".keyword", politicsLevel)));
hitList.forEach(politicsLevel -> politicsLevelBool.should(QueryBuilders.termQuery(GenericAttribute.ES_SENSITIVE_CHANNEL + "." + GenericAttribute.ES_POLITICS_LEVEL + ".keyword", politicsLevel)));
boolQueryBuilder.must(politicsLevelBool);
} }
if (!Tools.isEmpty(config.getFields())) { if (!Tools.isEmpty(config.getFields())) {
List<String> hitList = config.getFields(); List<String> hitList = config.getFields();
if (config.getFields().contains("全部")) { if (config.getFields().contains("全部")) {
hitList = ChannelType.COMMON_FIELDS; hitList = ChannelType.COMMON_FIELDS;
} }
BoolQueryBuilder fieldBool = QueryBuilders.boolQuery(); hitList.forEach(field -> hitBoolQuery.should(QueryBuilders.termQuery(GenericAttribute.ES_SENSITIVE_CHANNEL + "." + GenericAttribute.ES_FIELD + ".keyword", field)));
hitList.forEach(field -> fieldBool.should(QueryBuilders.termQuery(GenericAttribute.ES_SENSITIVE_CHANNEL + "." + GenericAttribute.ES_FIELD + ".keyword", field)));
boolQueryBuilder.must(fieldBool);
} }
boolQueryBuilder.must(hitBoolQuery);
} }
public static void addSensitiveChannel(String politicsLevel, String field, String region, String mainBodyType, BoolQueryBuilder boolQueryBuilder) { public static void addSensitiveChannel(String politicsLevel, String field, String region, String mainBodyType, BoolQueryBuilder boolQueryBuilder) {
......
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