增加参数

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/core/common/dto/DangerDto.java

@@ -32,9 +32,14 @@ public class DangerDto {
     private String dangerLevel;
 
     /**
+     * 隐患等级名称
+     */
+    private String dangerLevelName;
+
+    /**
      * 状态
      */
-    private String state;
+    private String dangerState;
 
     /**
      * 是否删除
@@ -59,6 +64,12 @@ public class DangerDto {
 
 
     /**
+     * 问题描述
+     */
+    private String remark;
+
+
+    /**
      * 检查类型:1-自行检查 ；2计划检查
      */
     private String checkMode;
@@ -93,5 +104,41 @@ public class DangerDto {
     /**
      * 状态
      */
-    private String stateName;
+    private String dangerStateName;
+
+    /**
+     * 建筑id
+     */
+    private Long structureId;
+
+    /**
+     * 建筑名称
+     */
+    private String structureName;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+    /**
+     * 隐患地址
+     */
+    private String dangerPosition;
+
+
+    /**
+     * 治理方式
+     */
+    private String reformType;
+
+    /**
+     * 治理方式名称
+     */
+    private String reformTypeName;
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/feign/DangerFeignClient.java

@@ -40,22 +40,22 @@ public interface DangerFeignClient {
      *
      * @param page   分页信息
      * @param ids    隐患ids
-     * @param level  隐患级别
-     * @param status 隐患状态
+     * @param dangerLevel  隐患级别
+     * @param dangerState 隐患状态
      * @return FeignClientResult
      */
     @GetMapping(value = "/page-list")
-    FeignClientResult<IPage<DangerDto>> pageList(Page page, @RequestParam String ids, @RequestParam(required = false) String level, @RequestParam(required = false) String status);
+    FeignClientResult<IPage<DangerDto>> pageList(Page page, @RequestParam String ids, @RequestParam(required = false) String dangerLevel, @RequestParam(required = false) String dangerState);
 
 
     /**
      * 查询所有的隐患
      *
      * @param ids    隐患ids
-     * @param level  隐患级别
-     * @param status 隐患状态
+     * @param dangerLevel  隐患级别
+     * @param dangerState 隐患状态
      * @return FeignClientResult
      */
     @GetMapping(value = "/list-all")
-    FeignClientResult<List<DangerDto>> listAll(@RequestParam String ids, @RequestParam(required = false) String level, @RequestParam(required = false) String status);
+    FeignClientResult<List<DangerDto>> listAll(@RequestParam String ids, @RequestParam(required = false) String dangerLevel, @RequestParam(required = false) String dangerState);
 }