Merge remote-tracking branch 'origin/developer' into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/AlertCalledController.java

@@ -68,7 +68,7 @@ import java.util.stream.Stream;
  */
 @RestController
 @Api(tags = "警情接警填报记录Api")
-@RequestMapping(value = "/tzs/alert-called")
+@RequestMapping(value = "/alert-called")
 public class AlertCalledController extends BaseController {
 
 	@Autowired

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/DispatchPaperController.java

@@ -34,7 +34,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
  */
 @RestController
 @Api(tags = "派遣单Api")
-@RequestMapping(value = "/tzs/dispatch-paper")
+@RequestMapping(value = "/dispatch-paper")
 public class DispatchPaperController extends BaseController {
 
     @Autowired

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/DispatchTaskController.java

@@ -34,7 +34,7 @@ import io.swagger.annotations.ApiOperation;
  */
 @RestController
 @Api(tags = "派遣任务Api")
-@RequestMapping(value = "/tzs/dispatch-task")
+@RequestMapping(value = "/dispatch-task")
 public class DispatchTaskController extends BaseController {
 
     @Autowired

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/RepairConsultController.java

@@ -35,7 +35,7 @@ import java.util.List;
  */
 @RestController
 @Api(tags = "处置过程Api")
-@RequestMapping(value = "/tzs/repair-consult")
+@RequestMapping(value = "/repair-consult")
 public class RepairConsultController extends BaseController {
 
     @Autowired

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/RescueProcessController.java

@@ -34,7 +34,7 @@ import io.swagger.annotations.ApiOperation;
  */
 @RestController
 @Api(tags = "救援过程表Api")
-@RequestMapping(value = "/tzs/rescue-process")
+@RequestMapping(value = "/rescue-process")
 public class RescueProcessController extends BaseController {
 
     @Autowired

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/TemplateController.java

@@ -32,7 +32,7 @@ import java.util.List;
  */
 @RestController
 @Api(tags = "模板表Api")
-@RequestMapping(value = "/tzs/template")
+@RequestMapping(value = "/template")
 public class TemplateController extends BaseController {
 
     @Autowired

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/VoiceRecordFileController.java

 package com.yeejoin.amos.boot.module.tzs.biz.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.module.tzs.api.dto.AlertCalledFormDto;
@@ -39,7 +38,7 @@ import java.util.UUID;
  */
 @RestController
 @Api(tags = "通话记录附件Api")
-@RequestMapping(value = "/tzs/voice-record-file")
+@RequestMapping(value = "/voice-record-file")
 public class VoiceRecordFileController extends BaseController {
 
     @Autowired

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);
 		}
 
         /**