From 36b4c67e63bd4e600efff7f95302fa9c5e0ddcf9 Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Tue, 21 Jul 2026 13:50:07 +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

---
 .../check/dto/clientobject/FirePointDeviceCO.java | 15 +--------------
 .../dataobject/FirePointDeviceCountDO.java        | 10 +---------
 .../src/main/resources/mapper/FirePointMapper.xml |  7 ++-----
 3 files changed, 4 insertions(+), 28 deletions(-)

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 0101be7..23985a1 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
@@ -1,6 +1,5 @@
 package com.zcloud.fire.check.dto.clientobject;
 
-import com.alibaba.cola.dto.ClientObject;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -8,19 +7,7 @@ import lombok.Data;
  * 消防点位设备数量
  */
 @Data
-public class FirePointDeviceCO extends ClientObject {
-
-    @ApiModelProperty(value = "消防点位id")
-    private String firePointId;
-
-    @ApiModelProperty(value = "消防点位")
-    private String firePointName;
-
-    @ApiModelProperty(value = "经度")
-    private String longitude;
-
-    @ApiModelProperty(value = "纬度")
-    private String latitude;
+public class FirePointDeviceCO extends FirePointCO {
 
     @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 5019231..2406a69 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
@@ -6,15 +6,7 @@ import lombok.Data;
  * 消防点位设备数量
  */
 @Data
-public class FirePointDeviceCountDO {
-
-    private String firePointId;
-
-    private String firePointName;
-
-    private String longitude;
-
-    private String latitude;
+public class FirePointDeviceCountDO extends FirePointDO {
 
     private String fireDeviceType;
 
diff --git a/web-infrastructure/src/main/resources/mapper/FirePointMapper.xml b/web-infrastructure/src/main/resources/mapper/FirePointMapper.xml
index af57297..6b22136 100644
--- a/web-infrastructure/src/main/resources/mapper/FirePointMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/FirePointMapper.xml
@@ -103,10 +103,7 @@
     </select>
     <select id="listDevice" resultType="com.zcloud.fire.check.persistence.dataobject.FirePointDeviceCountDO">
         select
-            p.fire_point_id as firePointId,
-            p.fire_point_name as firePointName,
-            p.longitude as longitude,
-            p.latitude as latitude,
+            p.*,
             d.fire_device_type as fireDeviceType,
             d.fire_device_type_name as fireDeviceTypeName,
             count(d.fire_device_id) as deviceCount
@@ -137,7 +134,7 @@
                 #{item}
             </foreach>
         </if>
-        group by p.fire_point_id, p.fire_point_name, p.longitude, p.latitude, d.fire_device_type, d.fire_device_type_name
+        group by p.id, d.fire_device_type, d.fire_device_type_name
         order by p.fire_point_name asc, d.fire_device_type_name asc
     </select>
 </mapper>