From 2bf095b6fe0b934ec1385cf2c252e0e455faad2c Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Mon, 20 Jul 2026 15:15:51 +0800
Subject: [PATCH] =?UTF-8?q?chore(build):=20=E5=8F=AF=E8=A7=86=E5=8C=96?=
 =?UTF-8?q?=E5=A4=A7=E5=B1=8F-=E6=B6=88=E9=98=B2=E7=82=B9=E4=BD=8D?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8,=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=92=8C=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zcloud/fire/check/web/FirePointController.java    |  2 +-
 .../com/zcloud/fire/check/dto/FirePointDeviceQry.java |  3 +++
 .../check/dto/clientobject/FirePointDeviceCO.java     |  6 ++++++
 .../dataobject/FirePointDeviceCountDO.java            |  4 ++++
 .../src/main/resources/mapper/FirePointMapper.xml     | 11 ++++++++---
 5 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/web-adapter/src/main/java/com/zcloud/fire/check/web/FirePointController.java b/web-adapter/src/main/java/com/zcloud/fire/check/web/FirePointController.java
index 968ffef..47f1eb3 100644
--- a/web-adapter/src/main/java/com/zcloud/fire/check/web/FirePointController.java
+++ b/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);
diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/FirePointDeviceQry.java b/web-client/src/main/java/com/zcloud/fire/check/dto/FirePointDeviceQry.java
index 26b05a5..e1556a4 100644
--- a/web-client/src/main/java/com/zcloud/fire/check/dto/FirePointDeviceQry.java
+++ b/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;
 
diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FirePointDeviceCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FirePointDeviceCO.java
index 18b27f4..0101be7 100644
--- a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/FirePointDeviceCO.java
+++ b/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;
 
diff --git a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FirePointDeviceCountDO.java b/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FirePointDeviceCountDO.java
index 57d4fce..5019231 100644
--- a/web-infrastructure/src/main/java/com/zcloud/fire/check/persistence/dataobject/FirePointDeviceCountDO.java
+++ b/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;
diff --git a/web-infrastructure/src/main/resources/mapper/FirePointMapper.xml b/web-infrastructure/src/main/resources/mapper/FirePointMapper.xml
index 518b21c..af57297 100644
--- a/web-infrastructure/src/main/resources/mapper/FirePointMapper.xml
+++ b/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>