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

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 {
+public class FirePointDeviceCO extends FirePointCO {
-
-    @ApiModelProperty(value = "消防点位id")
-    private String firePointId;
-
-    @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

@@ -6,15 +6,7 @@ import lombok.Data;
  * 消防点位设备数量
  */
 @Data
-public class FirePointDeviceCountDO {
+public class FirePointDeviceCountDO extends FirePointDO {
-
-    private String firePointId;
-
-    private String firePointName;
-
-    private String longitude;
-
-    private String latitude;
 
     private String fireDeviceType;
 

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.*,
-            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
@@ -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>