chore(build): 可视化大屏-消防点位设备列表,增加返回和请求

web-adapter/src/main/java/com/zcloud/fire/check/web/FirePointController.java

@@ -96,7 +96,7 @@ public class FirePointController {
         firePointService.exportFirePointPage(ids,httpServletResponse);
     }
 
-       @ApiOperation("可视化大屏-消防点位设备列表")
+    @ApiOperation("可视化大屏-消防点位设备列表")
     @PostMapping("/deviceList")
     public PageResponse<FirePointDeviceCO> deviceList(@RequestBody FirePointDeviceQry qry) {
         return firePointService.listDevice(qry);

web-client/src/main/java/com/zcloud/fire/check/dto/FirePointDeviceQry.java

@@ -15,6 +15,9 @@ public class FirePointDeviceQry extends PageQuery {
     @ApiModelProperty(value = "企业id", name = "corpinfoId")
     private Long corpinfoId;
 
+    @ApiModelProperty(value = "港区，1:秦皇岛港区,2:秦皇岛东,3:秦皇岛西", name = "portArea")
+    private Integer portArea;
+
     @ApiModelProperty(value = "消防设备类型", name = "fireDeviceType")
     private String fireDeviceType;
 

web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FirePointDeviceCO.java

@@ -16,6 +16,12 @@ public class FirePointDeviceCO extends ClientObject {
     @ApiModelProperty(value = "消防点位")
     private String firePointName;
 
+    @ApiModelProperty(value = "经度")
+    private String longitude;
+
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
+
     @ApiModelProperty(value = "消防设备类型")
     private String fireDeviceType;
 

web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FirePointDeviceCountDO.java

@@ -12,6 +12,10 @@ public class FirePointDeviceCountDO {
 
     private String firePointName;
 
+    private String longitude;
+
+    private String latitude;
+
     private String fireDeviceType;
 
     private String fireDeviceTypeName;

web-infrastructure/src/main/resources/mapper/FirePointMapper.xml

@@ -105,6 +105,8 @@
         select
             p.fire_point_id as firePointId,
             p.fire_point_name as firePointName,
+            p.longitude as longitude,
+            p.latitude as latitude,
             d.fire_device_type as fireDeviceType,
             d.fire_device_type_name as fireDeviceTypeName,
             count(d.fire_device_id) as deviceCount
@@ -115,6 +117,9 @@
         <if test="params.corpinfoId != null">
             and p.corpinfo_id = #{params.corpinfoId}
         </if>
+        <if test="params.portArea != null">
+            and c.port_area = #{params.portArea}
+        </if>
         <if test="params.fireDeviceType != null and params.fireDeviceType != ''">
             and d.fire_device_type = #{params.fireDeviceType}
         </if>
@@ -126,13 +131,13 @@
                 or d.fire_device_type_name like concat('%', #{params.vagueKey}, '%')
             )
         </if>
-        <if test="params.type != null and !params.type.isEmpty()">
+        <if test="params.inType != null and !params.inType.isEmpty()">
             and c.type in
-            <foreach collection="params.type" item="item" open="(" close=")" separator=",">
+            <foreach collection="params.inType" item="item" open="(" close=")" separator=",">
                 #{item}
             </foreach>
         </if>
-        group by p.fire_point_id, p.fire_point_name, d.fire_device_type, d.fire_device_type_name
+        group by p.fire_point_id, p.fire_point_name, p.longitude, p.latitude, d.fire_device_type, d.fire_device_type_name
         order by p.fire_point_name asc, d.fire_device_type_name asc
     </select>
 </mapper>