相似警情修改

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

@@ -171,39 +171,39 @@ public class ESAlertCalledService {
         long currentTime = System.currentTimeMillis() ;
         currentTime = currentTime - 120*60*1000;
         BoolQueryBuilder qb1 = QueryBuilders.boolQuery()
-        		.must(QueryBuilders.rangeQuery("callTimeLong").gte(currentTime));
+        		.filter(QueryBuilders.rangeQuery("callTimeLong").gte(currentTime));
         boolMust.must(qb1);
         //报警电话一致
         if (!ValidationUtil.isEmpty(alertCalled.getEmergencyCall()) && !ValidationUtil.isEmpty(alertCalled.getContactPhone()))
 		{
         	BoolQueryBuilder qb2 = QueryBuilders.boolQuery()
-        			.must(QueryBuilders.termQuery("emergencyCall.keyword", alertCalled.getEmergencyCall()))
-        			.must(QueryBuilders.termQuery("contactPhone.keyword", alertCalled.getContactPhone()));
-        	boolMust.should(qb2);
+        			.should(QueryBuilders.termQuery("emergencyCall.keyword", alertCalled.getEmergencyCall()))
+        			.should(QueryBuilders.termQuery("contactPhone.keyword", alertCalled.getContactPhone()));
+        	boolMust.must(qb2);
 		}
         //事发地点一致，或相距不超过200米的
         if (!ValidationUtil.isEmpty(alertCalled.getAddress()))
 		{
         	BoolQueryBuilder qb3 = QueryBuilders.boolQuery()
-        			.should(QueryBuilders.matchQuery("address", alertCalled.getAddress()));
+        			.filter(QueryBuilders.matchQuery("address", alertCalled.getAddress()));
         	boolMust.should(qb3);
 		}
         //警情类型一致
         BoolQueryBuilder qb4 = QueryBuilders.boolQuery()
-        		.must(QueryBuilders.termQuery("alarmTypeCode", alertCalled.getAlarmTypeCode()));
+        		.filter(QueryBuilders.termQuery("alarmTypeCode", alertCalled.getAlarmTypeCode()));
         boolMust.must(qb4);
         //使用单位名称一致
         if (!ValidationUtil.isEmpty(alertCalled.getUseUnit()))
 		{
         	BoolQueryBuilder qb5 = QueryBuilders.boolQuery()
-        			.must(QueryBuilders.termQuery("useUnit.keyword", alertCalled.getUseUnit()));
+        			.filter(QueryBuilders.termQuery("useUnit.keyword", alertCalled.getUseUnit()));
         	boolMust.must(qb5);
 		}
         //电梯识别码一致
         if(!ValidationUtil.isEmpty(alertCalled.getDeviceId())) {
 			BoolQueryBuilder qb6 = QueryBuilders.boolQuery()
-					.must(QueryBuilders.termQuery("deviceId.keyword", alertCalled.getDeviceId()));
-			boolMust.should(qb6);
+					.filter(QueryBuilders.termQuery("deviceId.keyword", alertCalled.getDeviceId()));
+			boolMust.must(qb6);
 		}
 
         /**