From 4262ec24ad2bdeae80952df71aef753ea86a3714 Mon Sep 17 00:00:00 2001
From: wzy-warehouse <18135009705@163.com>
Date: Sun, 28 Jun 2026 16:40:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=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

---
 src/main/java/com/gis/xian/dto/DisasterRiskData.java   |  2 ++
 .../xian/service/impl/IReportOutputServiceImpl.java    | 10 +++++++---
 .../config/customize/application-customize-dev.yml     |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/gis/xian/dto/DisasterRiskData.java b/src/main/java/com/gis/xian/dto/DisasterRiskData.java
index 8d7404f..bd46e08 100644
--- a/src/main/java/com/gis/xian/dto/DisasterRiskData.java
+++ b/src/main/java/com/gis/xian/dto/DisasterRiskData.java
@@ -48,6 +48,8 @@ public class DisasterRiskData {
         private int index;
         /** 位置 */
         private String position;
+        /** 乡镇/街道 */
+        private String village;
         /** 发生概率（小数 0-1） */
         private Double probability;
         /** 灾害等级：高(>=70%) / 中(50%-70%) */
diff --git a/src/main/java/com/gis/xian/service/impl/IReportOutputServiceImpl.java b/src/main/java/com/gis/xian/service/impl/IReportOutputServiceImpl.java
index 2ac4203..42b018a 100644
--- a/src/main/java/com/gis/xian/service/impl/IReportOutputServiceImpl.java
+++ b/src/main/java/com/gis/xian/service/impl/IReportOutputServiceImpl.java
@@ -214,6 +214,7 @@ public class IReportOutputServiceImpl implements ReportOutputService {
                         String level = prob >= 70 ? "高" : "中";
                         return new DisasterRiskData.SpotRisk()
                                 .setPosition(spot.getPosition())
+                                .setVillage(spot.getVillage())
                                 .setProbability(prob)
                                 .setRiskLevel(level);
                     })
@@ -227,9 +228,11 @@ public class IReportOutputServiceImpl implements ReportOutputService {
 
             data.setSpots(spots);
 
-            // 中高风险街道
+            // 中高风险街道（village 去重）
             data.setHighRiskStreets(spots.stream()
-                    .map(DisasterRiskData.SpotRisk::getPosition)
+                    .map(DisasterRiskData.SpotRisk::getVillage)
+                    .filter(Objects::nonNull)
+                    .distinct()
                     .collect(Collectors.joining("、")));
 
             // 图片
@@ -403,7 +406,8 @@ public class IReportOutputServiceImpl implements ReportOutputService {
     private String buildAllHighRiskPosition(List<DisasterRiskData> list) {
         return list.stream().filter(DisasterRiskData::hasData)
                 .flatMap(d -> d.getSpots().stream())
-                .map(DisasterRiskData.SpotRisk::getPosition)
+                .map(DisasterRiskData.SpotRisk::getVillage)
+                .filter(Objects::nonNull)
                 .distinct()
                 .collect(Collectors.joining("、"));
     }
diff --git a/src/main/resources/config/customize/application-customize-dev.yml b/src/main/resources/config/customize/application-customize-dev.yml
index f5e0f15..bb08e95 100644
--- a/src/main/resources/config/customize/application-customize-dev.yml
+++ b/src/main/resources/config/customize/application-customize-dev.yml
@@ -11,6 +11,6 @@ algorithm:
 # 文件配置
 files:
   server:
-    url: "http://localhost:8082"
+    url: "http://localhost:8083"
   local:
     path: "G:/files"
\ No newline at end of file