diff --git a/src/main/java/com/gis/xian/enums/DisasterTypeEnum.java b/src/main/java/com/gis/xian/enums/DisasterTypeEnum.java index a88a522..4a79b8d 100644 --- a/src/main/java/com/gis/xian/enums/DisasterTypeEnum.java +++ b/src/main/java/com/gis/xian/enums/DisasterTypeEnum.java @@ -6,6 +6,7 @@ import lombok.Getter; public enum DisasterTypeEnum { // 具体灾害类型 LANDSLIDE("landslide", "滑坡"), + COLLAPSE("collapse", "崩塌"), DEBRIS_FLOW("debris_flow", "泥石流"), FLASH_FLOOD("flash_flood", "山洪"), WATER_LOGGING("water_logging", "内涝"); diff --git a/src/main/java/com/gis/xian/service/impl/IXianHiddenDangerSpotsServiceImpl.java b/src/main/java/com/gis/xian/service/impl/IXianHiddenDangerSpotsServiceImpl.java index 9af9e4f..db88464 100644 --- a/src/main/java/com/gis/xian/service/impl/IXianHiddenDangerSpotsServiceImpl.java +++ b/src/main/java/com/gis/xian/service/impl/IXianHiddenDangerSpotsServiceImpl.java @@ -28,6 +28,9 @@ public class IXianHiddenDangerSpotsServiceImpl implements XianHiddenDangerSpotsS @Value("${init.data.base-points.hidden-danger.landslide}") private String landslideKey; + @Value("${init.data.base-points.hidden-danger.collapse}") + private String collapseKey; + @Value("${init.data.base-points.hidden-danger.debris-flow}") private String debrisFlowKey; @@ -68,6 +71,8 @@ public class IXianHiddenDangerSpotsServiceImpl implements XianHiddenDangerSpotsS switch (disasterType) { case "landslide": return landslideKey; + case "collapse": + return collapseKey; case "debris_flow": return debrisFlowKey; case "flash_flood": diff --git a/src/main/java/com/gis/xian/task/InitializeData.java b/src/main/java/com/gis/xian/task/InitializeData.java index d7b6554..b0dc119 100644 --- a/src/main/java/com/gis/xian/task/InitializeData.java +++ b/src/main/java/com/gis/xian/task/InitializeData.java @@ -63,6 +63,9 @@ public class InitializeData { @Value("${init.data.base-points.hidden-danger.landslide}") private String landslideKey; + @Value("${init.data.base-points.hidden-danger.collapse}") + private String collapseKey; + @Value("${init.data.base-points.hidden-danger.debris-flow}") private String debrisFlowKey; @@ -127,7 +130,17 @@ public class InitializeData { ); log.info("加载隐患点信息(滑坡)并写入redis完成"); }); - + + // 隐患点 - 崩塌 + CompletableFuture collapseFuture = CompletableFuture.runAsync(() -> { + redisTemplate.opsForValue().set(collapseKey, JSON.toJSONString( + XianHiddenDangerSpotsBasePointVo.entity2Vo( + xianHiddenDangerSpotsMapper.getBasePoints("collapse")) + ) + ); + log.info("加载隐患点信息(崩塌)并写入redis完成"); + }); + // 隐患点 - 泥石流 CompletableFuture debrisFlowFuture = CompletableFuture.runAsync(() -> { redisTemplate.opsForValue().set(debrisFlowKey, JSON.toJSONString( @@ -250,7 +263,7 @@ public class InitializeData { // 等待所有任务完成 CompletableFuture.allOf( - allFuture, landslideFuture, debrisFlowFuture, + allFuture, landslideFuture, collapseFuture, debrisFlowFuture, flashFloodFuture, waterLoggingFuture, riskFuture, hospitalsFuture, dangerousSourceFuture, emergencyShelterFuture, firefighterFuture, storePointsFuture, schoolFuture, diff --git a/src/main/resources/com/gis/xian/mapper/XianHiddenDangerSpotsMapper.xml b/src/main/resources/com/gis/xian/mapper/XianHiddenDangerSpotsMapper.xml index 1cb98ca..ca52c6f 100644 --- a/src/main/resources/com/gis/xian/mapper/XianHiddenDangerSpotsMapper.xml +++ b/src/main/resources/com/gis/xian/mapper/XianHiddenDangerSpotsMapper.xml @@ -25,17 +25,20 @@ - +