diff --git a/src/main/java/com/gis/xian/dto/qgis/base/QgisTriggerDTO.java b/src/main/java/com/gis/xian/dto/qgis/base/QgisTriggerDTO.java index 720c1c4..ba1b648 100644 --- a/src/main/java/com/gis/xian/dto/qgis/base/QgisTriggerDTO.java +++ b/src/main/java/com/gis/xian/dto/qgis/base/QgisTriggerDTO.java @@ -4,7 +4,7 @@ import lombok.Data; /** * 统一专题图触发请求 - * 只传递 simulationId 和类型,Python 端负责所有计算和产图 + * 只传递 simulationId,Python 端根据 ID 自行查库决定模板和类型 */ @Data public class QgisTriggerDTO { @@ -13,9 +13,4 @@ public class QgisTriggerDTO { * 模拟ID(事件唯一标识) */ private String simulationId; - - /** - * 类型:earthquake(地震)/ rainstorm(暴雨) - */ - private String type; } diff --git a/src/main/java/com/gis/xian/enums/DisasterTypeEnum.java b/src/main/java/com/gis/xian/enums/DisasterTypeEnum.java deleted file mode 100644 index a88a522..0000000 --- a/src/main/java/com/gis/xian/enums/DisasterTypeEnum.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.gis.xian.enums; - -import lombok.Getter; - -@Getter -public enum DisasterTypeEnum { - // 具体灾害类型 - LANDSLIDE("landslide", "滑坡"), - DEBRIS_FLOW("debris_flow", "泥石流"), - FLASH_FLOOD("flash_flood", "山洪"), - WATER_LOGGING("water_logging", "内涝"); - - private final String type; - private final String description; - - DisasterTypeEnum(String type, String description) { - this.type = type; - this.description = description; - } - - /** - * 根据type获取枚举 - */ - public static DisasterTypeEnum getByType(String type) { - for (DisasterTypeEnum e : values()) { - if (e.getType().equals(type)) { - return e; - } - } - return null; - } -} diff --git a/src/main/java/com/gis/xian/service/qgis/earthquake/IEarthquakeQueueService.java b/src/main/java/com/gis/xian/service/qgis/earthquake/IEarthquakeQueueService.java index 335c1af..4291857 100644 --- a/src/main/java/com/gis/xian/service/qgis/earthquake/IEarthquakeQueueService.java +++ b/src/main/java/com/gis/xian/service/qgis/earthquake/IEarthquakeQueueService.java @@ -5,14 +5,13 @@ import com.gis.xian.entity.qgis.earthquake.EarthquakeQueue; /** * 地震评估队列服务 - * 简化为只负责触发 Python 端 + * 只负责触发 Python 端生成专题图 */ public interface IEarthquakeQueueService extends IService { /** * 触发专题图生成 * @param simulationId 模拟ID - * @param type 类型:earthquake / rainstorm */ - void trigger(String simulationId, String type); + void trigger(String simulationId); } diff --git a/src/main/java/com/gis/xian/service/qgis/earthquake/impl/EarthquakeEventServiceImpl.java b/src/main/java/com/gis/xian/service/qgis/earthquake/impl/EarthquakeEventServiceImpl.java index e732cbd..746f6a4 100644 --- a/src/main/java/com/gis/xian/service/qgis/earthquake/impl/EarthquakeEventServiceImpl.java +++ b/src/main/java/com/gis/xian/service/qgis/earthquake/impl/EarthquakeEventServiceImpl.java @@ -62,7 +62,7 @@ public class EarthquakeEventServiceImpl extends ServiceImpl