日常管理-警情填报相似电梯查询

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/ElevatorNewDto.java

+package com.yeejoin.amos.boot.module.tzs.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author fengwang
+ * @date 2021-08-10.
+ */
+@Data
+@ApiModel(value="ElevatorNewDto", description="电梯对象集合")
+public class ElevatorNewDto {
+
+    @ApiModelProperty(value = "电梯基本信息")
+    ElevatorDto elevatorDto;
+
+}

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorDto;
+import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorNewDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
 import com.yeejoin.amos.boot.module.tzs.api.service.IElevatorService;
 import com.yeejoin.amos.boot.module.tzs.api.vo.ElevatorVo;
@@ -162,14 +163,14 @@ public class ElevatorController extends BaseController {
     /**
      * 相似电梯模糊查询
      *
-     * @param elevatorDto 查询参数
+     * @param elevatorNewDto 查询参数
      * @return 返回结果
      */
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/page/similar", method = RequestMethod.GET)
-    @ApiOperation(httpMethod = "GET", value = "相似电梯模糊查询", notes = "相似电梯模糊查询")
-    public ResponseModel<List<ElevatorVo>> similar(ElevatorDto elevatorDto) {
-        Elevator elevator = BeanDtoVoUtils.convert(elevatorDto, Elevator.class);
+    @RequestMapping(value = "/page/similar", method = RequestMethod.POST)
+    @ApiOperation(httpMethod = "POST", value = "相似电梯模糊查询", notes = "相似电梯模糊查询")
+    public ResponseModel<List<ElevatorVo>> similar(@RequestBody ElevatorNewDto elevatorNewDto) {
+        Elevator elevator = BeanDtoVoUtils.convert(elevatorNewDto.getElevatorDto(), Elevator.class);
         QueryWrapper<Elevator> elevatorQueryWrapper = new QueryWrapper<>();
         Class<? extends Elevator> aClass = elevator.getClass();
         Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {

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

@@ -190,7 +190,7 @@ public class ESAlertCalledService {
 		}
         //警情类型一致
         BoolQueryBuilder qb4 = QueryBuilders.boolQuery()
-        		.must(QueryBuilders.termQuery("alertTypeCode.keyword", alertCalled.getAlarmTypeCode()));
+        		.must(QueryBuilders.termQuery("alarmTypeCode.keyword", alertCalled.getAlarmTypeCode()));
         boolMust.should(qb4);
         //使用单位名称一致
         if (!ValidationUtil.isEmpty(alertCalled.getUseUnit()))