修改接口

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FireTeamZhDto.java

@@ -36,6 +36,9 @@ public class FireTeamZhDto  {
     @ApiModelProperty(value = "消防队类型")
     private String type;
 
+    @ApiModelProperty(value = "队伍类型code")
+    private String typeCode;
+
     @ApiModelProperty(value = "队伍地址")
     private String address;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FireStationMapper.xml

@@ -9,6 +9,7 @@
     a.sequence_nbr sequenceNbr,
     a.person_charge_name personChargeName,
     a.longitude,
+    a.name,
     a.latitude,
     a.person_charge_telephone personChargeTelephone,
     Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) AS distance

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FireTeamMapper.xml

@@ -91,6 +91,7 @@
         a.latitude,
         a.address,
         a.type ,
+        a.type_code typeCode,
         a.name ,
         a.contact_user contactUser,
         a.contact_phone contactPhone,

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AlertCalledZhDto.java

@@ -32,6 +32,8 @@ public class AlertCalledZhDto {
     @ApiModelProperty(value = "警情类型")
     private String alertType;
 
+    @ApiModelProperty(value = "报警类型code")
+    private String alarmTypeCode;
 
     @ApiModelProperty(value = "事发单位")
     private String unitInvolved;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -25,6 +25,7 @@
         a.alert_stage alertStage,
         a.call_time callTime,
         a.alert_type alertType,
+        a.alarm_type_code alarmTypeCode,
         a.unit_involved unitInvolved,
         a.trapped_num trappedNum,
         a.casualties_num casualtiesNum,

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -43,9 +43,6 @@ public class CommandController extends BaseController {
     IFireTeamService iFireTeamService;
     @Autowired
     IWaterResourceService iWaterResourceService;
-
-
-
     /**
      * 警情列表
      *
@@ -81,9 +78,32 @@ public class CommandController extends BaseController {
      * @return
      */
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "SY/list")
+    @GetMapping(value = "SY500/list")
+    @ApiOperation(httpMethod = "GET", value = "水源列表分页查询", notes = "水源列表分页查询")
+    public ResponseModel<IPage<WaterResourceZhDto>> listPageSY500(Integer pageNum, Integer pageSize, RequestData par) {
+
+        par.setDistance(500D);
+
+        Page<WaterResourceZhDto> pageBean = new Page<>(pageNum, pageSize);
+        List<WaterResourceZhDto>  list= iWaterResourceService.getWaterResourceList(pageNum,pageSize,par);
+        Integer num=  iWaterResourceService.getWaterResourceListCount(par);
+        pageBean.setRecords(list);
+        pageBean.setTotal(num);
+        return ResponseHelper.buildResponse(pageBean);
+    }
+
+
+
+    /**
+     * 水源列表分页查询
+     *
+     * @return
+     */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "SY1000/list")
     @ApiOperation(httpMethod = "GET", value = "水源列表分页查询", notes = "水源列表分页查询")
-    public ResponseModel<IPage<WaterResourceZhDto>> listPageSy(Integer pageNum, Integer pageSize, RequestData par) {
+    public ResponseModel<IPage<WaterResourceZhDto>> listPageSY1000(Integer pageNum, Integer pageSize, RequestData par) {
+        par.setDistance(1000D);
         Page<WaterResourceZhDto> pageBean = new Page<>(pageNum, pageSize);
         List<WaterResourceZhDto>  list= iWaterResourceService.getWaterResourceList(pageNum,pageSize,par);
         Integer num=  iWaterResourceService.getWaterResourceListCount(par);
@@ -91,6 +111,27 @@ public class CommandController extends BaseController {
         pageBean.setTotal(num);
         return ResponseHelper.buildResponse(pageBean);
     }
+
+
+
+//    /**
+//     * 水源列表分页查询
+//     *
+//     * @return
+//     */
+//    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+//    @GetMapping(value = "SYTY/list")
+//    @ApiOperation(httpMethod = "GET", value = "水源列表分页查询", notes = "水源列表分页查询")
+//    public ResponseModel<IPage<WaterResourceZhDto>> listPageSYTY(Integer pageNum, Integer pageSize, RequestData par) {
+//        Page<WaterResourceZhDto> pageBean = new Page<>(pageNum, pageSize);
+//        List<WaterResourceZhDto>  list= iWaterResourceService.getWaterResourceList(pageNum,pageSize,par);
+//        Integer num=  iWaterResourceService.getWaterResourceListCount(par);
+//        pageBean.setRecords(list);
+//        pageBean.setTotal(num);
+//        return ResponseHelper.buildResponse(pageBean);
+//    }
+
+
     /**
      * 消防队伍列表分页查询
      *
@@ -171,5 +212,5 @@ public class CommandController extends BaseController {
     }
 
 
-    
+
 }
\ No newline at end of file