AED布点支持手动位置位置信息

db/sql/2025-12-02-xj_emergency加字段.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `aed_equipment_manger`
+    ADD COLUMN `geo_collect_type` tinyint NULL DEFAULT 0 COMMENT '位置数据维护方式(0-地图选点,1-手动维护)' AFTER `latitude`;

health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/AedEquipmentManger.java

@@ -47,6 +47,12 @@ public class AedEquipmentManger implements Serializable {
     @Excel(name = "资源名称", width = 15)
     @Schema(title = "资源名称")
     private String name;
+    /**
+     * 位置数据维护方式
+     */
+    @Schema(title = "位置数据维护方式(0-地图选点,1-手动维护)")
+    @Dict(dicCode = "geo_collect_type")
+    private Integer geoCollectType = 0;
     /**
      * 经度
      */

health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/mapper/xml/AedEquipmentMangerMapper.xml

@@ -34,6 +34,7 @@
         install_address as installAddress,
         longitude as longitude,
         latitude as latitude,
+        geo_collect_type as geoCollectType,
         control_org_name as controlOrgName,
         mfrs_name as mfrsName,
         camera_num as cameraNum,
@@ -79,6 +80,7 @@
         install_time as installTime,
         longitude as longitude,
         latitude as latitude,
+        geo_collect_type as geoCollectType,
         control_org_name as controlOrgName,
         manage_user_name as manageUserName,
         manage_user_mobile as manageUserMobile,

health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/vo/req/manager/AEDPublishEquipmentReq.java

@@ -3,6 +3,7 @@ package com.renkang.emergency.aed.vo.req.manager;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -63,6 +64,14 @@ public class AEDPublishEquipmentReq {
     @Schema(title = "纬度")
 //    @NotNull(message = "纬度不能为空，请输入纬度")
     private Double latitude;
+
+    /**
+     * 位置数据维护方式
+     */
+    @Schema(title = "位置数据维护方式(0-地图选点,1-手动维护)")
+    @Dict(dicCode = "geo_collect_type")
+    private Integer geoCollectType = 0;
+
     /**
      * 覆盖人数
      */

health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/vo/res/manager/AEDManagerPageRes.java

@@ -250,4 +250,11 @@ public class AEDManagerPageRes {
      */
     @Schema(title = "纬度")
     private BigDecimal latitude;
+
+    /**
+     * 位置数据维护方式
+     */
+    @Schema(title = "位置数据维护方式(0-地图选点,1-手动维护)")
+    @Dict(dicCode = "geo_collect_type")
+    private Integer geoCollectType = 0;
 }

health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/vo/res/manager/AEDPublishPageRes.java

@@ -113,6 +113,12 @@ public class AEDPublishPageRes {
     @Schema(title = "纬度")
     private Double latitude;
 
+    /**
+     * 位置数据维护方式
+     */
+    @Schema(title = "位置数据维护方式(0-地图选点,1-手动维护)")
+    @Dict(dicCode = "geo_collect_type")
+    private Integer geoCollectType = 0;
 
     /**
      * 管理部门