Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ESAlertCalledService.java

@@ -208,7 +208,7 @@ public class ESAlertCalledService {
         /**
          * 通用匹配规则，条件构建
          */
-    	BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
+    	BoolQueryBuilder boolMustAll = QueryBuilders.boolQuery();
     	//警情状态
     	BoolQueryBuilder qb0 = QueryBuilders.boolQuery();
     	for (String status : alertStatus)
@@ -219,7 +219,9 @@ public class ESAlertCalledService {
     			qb0.should(QueryBuilders.termQuery("alertStatusStr.keyword", alertStatusEnum.getCode()));
 			}
 		}
-    	boolMust.must(qb0);
+    	boolMustAll.must(qb0);
+    	
+    	BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
         //接警时间，距离当前时间不超过半小时的
         long currentTime = System.currentTimeMillis() ;
         currentTime = currentTime - 30*60*1000;
@@ -258,7 +260,8 @@ public class ESAlertCalledService {
          */
 
 
-
+        boolMust.minimumShouldMatch(1);//至少满足一个
+        boolMustAll.must(boolMust);
         // 创建查询构造器
         NativeSearchQueryBuilder queryBuilder = new NativeSearchQueryBuilder()
                 // 分页
@@ -266,7 +269,7 @@ public class ESAlertCalledService {
                 // 排序
 //                .withSort(SortBuilders.fieldSort("callTimeLong").order(SortOrder.DESC))
                 //过滤条件
-                .withQuery(boolMust);
+                .withQuery(boolMustAll);
 
         List<ESAlertCalledDto> list = new LinkedList<>();
         long totle = 0;