修改特种设备es 接口

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

@@ -4,8 +4,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * 特种设备搜索DTO
  */
@@ -64,4 +62,5 @@ public class EsSpecialEquipmentDto {
     @ApiModelProperty(value = "聚合精确度1-12")
     private Integer precision;
 
+
 }

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

@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.feign.AmosFeignService;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
+import com.yeejoin.amos.boot.module.tzs.api.dto.ESAlertCalledDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorBaseInfoDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorInfoDto;
@@ -100,55 +101,52 @@ public class SpecialEquipmentController extends BaseController {
     private IElevatorRelationService elevatorRelationService;
 
 
-
     /**
-     * ES查询电梯信息
+     * ES查询特种设备信息    带分页    加经纬度过滤 keyword 搜索
      *
      * @return 查询结果
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/querySpecialEquipment", method = RequestMethod.POST)
-    @ApiOperation(httpMethod = "POST", value = "ES查询八大类信息", notes = "ES查询八大类信息")
-    public ResponseModel<Map<String, List<SpecialEquipmentDto>>> querySpecialEquipment(@RequestBody EsSpecialEquipmentDto esSpecialEquipmentDto){
-        Map<String, List<SpecialEquipmentDto>> result = new HashMap<>();
-
+    @RequestMapping(value = "/querySpecialEquipmentListPage", method = RequestMethod.POST)
+    @ApiOperation(httpMethod = "POST", value = "ES查询特种设备信息带分页 ", notes = "ES查询特种设备信息带分页")
+    public ResponseModel<Page<SpecialEquipmentDto>> querySpecialEquipmentListPage(@RequestBody EsSpecialEquipmentDto esSpecialEquipmentDto
+            , @RequestParam(value = "current") int current, @RequestParam(value = "size") int size){
+        Page<SpecialEquipmentDto> result = null;
+        if (ValidationUtil.isEmpty(esSpecialEquipmentDto.getCategoryCode())) {
+            throw new BadRequest("参数校验失败.");
+        }
         if(StringUtils.isNotBlank(esSpecialEquipmentDto.getCategoryCode())) { // 查找特定设备
             if("3000".equals(esSpecialEquipmentDto.getCategoryCode())) {
-                List<SpecialEquipmentDto>  elevatorList = esElevatorService.queryByDto(esSpecialEquipmentDto, true);
-                result.put("3000",elevatorList);
+                result = esElevatorService.queryPageByDto(esSpecialEquipmentDto, current, size);
             }
-        } else { // 查找所有设备
-            // 查找电梯数据
-            List<SpecialEquipmentDto>  elevatorList = esElevatorService.queryByDto(esSpecialEquipmentDto, false);
-            result.put("3000",elevatorList);
         }
         return ResponseHelper.buildResponse(result);
     }
 
 
-
     /**
-     * ES查询电梯信息
+     * ES查询特种设备信息    不带分页   加经纬度过滤  keyword 搜索
      *
      * @return 查询结果
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/querySpecialEquipmentList", method = RequestMethod.POST)
-    @ApiOperation(httpMethod = "POST", value = "ES查询八大类列表信息", notes = "ES查询八大类列表信息")
-    public ResponseModel<List<SpecialEquipmentDto>> querySpecialEquipmentList(@RequestBody EsSpecialEquipmentListDto eSpecialEquipmentListDto){
+    @ApiOperation(httpMethod = "POST", value = "ES查询特种设备信息不带分页", notes = "ES查询特种设备信息不带分页")
+    public ResponseModel<List<SpecialEquipmentDto>> querySpecialEquipmentList(@RequestBody EsSpecialEquipmentDto esSpecialEquipmentDto){
         List<SpecialEquipmentDto> result = new ArrayList<>();
-
-        if (ValidationUtil.isEmpty(eSpecialEquipmentListDto.getCategoryCode())) {
+        if (ValidationUtil.isEmpty(esSpecialEquipmentDto.getCategoryCode())) {
             throw new BadRequest("参数校验失败.");
         }
-        if("3000".equals(eSpecialEquipmentListDto.getCategoryCode())) {
-            result = esElevatorService.queryListByDto(eSpecialEquipmentListDto);
+        if(StringUtils.isNotBlank(esSpecialEquipmentDto.getCategoryCode())) { // 查找特定设备
+            if("3000".equals(esSpecialEquipmentDto.getCategoryCode())) {
+                result = esElevatorService.queryByDto(esSpecialEquipmentDto);
+            }
         }
         return ResponseHelper.buildResponse(result);
     }
 
     /**
-     * ES查询电梯信息
+     * ES查询特种设备聚合信息
      *
      * @return 查询结果
      */
@@ -170,10 +168,38 @@ public class SpecialEquipmentController extends BaseController {
                 result = esElevatorService.queryTogetherByDto(esSpecialEquipmentDto);
             }
         }
+        return ResponseHelper.buildResponse(result);
+    }
 
 
+    /***
+     * keyword 区域 查询八大类总数
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/queryEquipNum", method = RequestMethod.POST)
+    @ApiOperation(httpMethod = "POST", value = "查询八大类总数", notes = "查询八大类总数")
+    public ResponseModel<Map<String, Long>> queryEquipNum(@RequestBody EsSpecialEquipmentDto esSpecialEquipmentDto){
+        Map<String, Long> result = new HashMap<>();
+        //  锅炉
+        Long boiler = 0l;
+        result.put("1000",boiler);
+        // 压力容器
+        Long vessel = 0l;
+        result.put("2000",vessel);
+        // 电梯
+        Long elevator = esElevatorService.queryNumberByDto(esSpecialEquipmentDto);
+        result.put("3000",elevator);
+        // 起重机械
+        Long crane = 0l;
+        result.put("4000",crane);
+        // 大型游乐设施
+        Long facility = 0l;
+        result.put("6000",facility);
+        // 大型游乐设施
+
         return ResponseHelper.buildResponse(result);
     }
 
+
 }
 

amos-boot-system-tzs/src/main/resources/application.properties

-spring.application.name=TZS
+spring.application.name=TZS-kfm
 server.servlet.context-path=/tzs
 server.port=11000
 spring.profiles.active=dev