From ae4c5e7ee6f47fd792f3e2f6196a8f403f7e190a Mon Sep 17 00:00:00 2001 From: feng <18691763612@163.com> Date: Tue, 2 Dec 2025 11:21:50 +0800 Subject: [PATCH] =?UTF-8?q?AED=E5=B8=83=E7=82=B9=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=89=8B=E5=8A=A8=E4=BD=8D=E7=BD=AE=E4=BD=8D=E7=BD=AE=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/sql/2025-12-02-xj_emergency加字段.sql | 2 ++ .../com/renkang/emergency/entity/AedEquipmentManger.java | 6 ++++++ .../aed/mapper/xml/AedEquipmentMangerMapper.xml | 2 ++ .../aed/vo/req/manager/AEDPublishEquipmentReq.java | 9 +++++++++ .../emergency/aed/vo/res/manager/AEDManagerPageRes.java | 7 +++++++ .../emergency/aed/vo/res/manager/AEDPublishPageRes.java | 6 ++++++ 6 files changed, 32 insertions(+) create mode 100644 db/sql/2025-12-02-xj_emergency加字段.sql diff --git a/db/sql/2025-12-02-xj_emergency加字段.sql b/db/sql/2025-12-02-xj_emergency加字段.sql new file mode 100644 index 0000000..f1a5b56 --- /dev/null +++ b/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`; \ No newline at end of file diff --git a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/AedEquipmentManger.java b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/AedEquipmentManger.java index 5d52d14..f8ef564 100644 --- a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/AedEquipmentManger.java +++ b/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; /** * 经度 */ diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/mapper/xml/AedEquipmentMangerMapper.xml b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/mapper/xml/AedEquipmentMangerMapper.xml index bdf2018..294da69 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/mapper/xml/AedEquipmentMangerMapper.xml +++ b/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, diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/vo/req/manager/AEDPublishEquipmentReq.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/vo/req/manager/AEDPublishEquipmentReq.java index 01cc133..dc369bb 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/vo/req/manager/AEDPublishEquipmentReq.java +++ b/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; + /** * 覆盖人数 */ diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/vo/res/manager/AEDManagerPageRes.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/vo/res/manager/AEDManagerPageRes.java index d12758c..5b736a6 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/vo/res/manager/AEDManagerPageRes.java +++ b/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; } diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/vo/res/manager/AEDPublishPageRes.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/vo/res/manager/AEDPublishPageRes.java index e9b13c9..f30dc9f 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/aed/vo/res/manager/AEDPublishPageRes.java +++ b/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; /** * 管理部门