From 19681d9d5fe432ff7ed2816680bd8cb5f4f50adb Mon Sep 17 00:00:00 2001
From: gjh <1421wake>
Date: Wed, 20 Aug 2025 10:24:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=84=E5=8C=BA=E7=9B=AE=E6=A0=87=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0-=E5=A2=9E=E5=8A=A0=E5=88=A4=E7=A9=BA=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/controller/AreaInfoController.java   |  3 +++
 .../service/impl/AreaInfoServiceImpl.java     | 23 +++++++++++--------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/AreaInfoController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/AreaInfoController.java
index a4aa375..fa60bf1 100644
--- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/AreaInfoController.java
+++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/AreaInfoController.java
@@ -59,6 +59,9 @@ public class AreaInfoController extends BaseController {
         ExcelUtil.exportExcel(list, "区域信息", AreaInfoVo.class, response);
     }
 
+    /**
+     * 获取区域信息列表+AI描述
+     */
     @GetMapping("/getList")
     public R<List<AreaInfoFinalVo>> getList(AreaInfoBo bo) {
         List<AreaInfoFinalVo> rs = areaInfoService.getList(bo);
diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/AreaInfoServiceImpl.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/AreaInfoServiceImpl.java
index e0578d8..5b1c2ea 100644
--- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/AreaInfoServiceImpl.java
+++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/AreaInfoServiceImpl.java
@@ -1,5 +1,6 @@
 package org.dromara.demo.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -145,16 +146,20 @@ public class AreaInfoServiceImpl implements IAreaInfoService {
         // 从数据库中获取的所有区域信息
         List<AreaInfoVo> areaInfoVos = this.queryList(bo);
 
-        // 按 district（区域）分组
-        Map<String, List<AreaInfoVo>> groupedByDistrict = areaInfoVos.stream()
-            .collect(Collectors.groupingBy(AreaInfoVo::getDistrict));
+        if (CollectionUtil.isNotEmpty(areaInfoVos)){
+            // 按 district（区域）分组
+            Map<String, List<AreaInfoVo>> groupedByDistrict = areaInfoVos.stream()
+                .collect(Collectors.groupingBy(AreaInfoVo::getDistrict));
 
-        // 转换为 List<AreaInfoFinalVo>
-        List<AreaInfoFinalVo> result = new ArrayList<>();
-        for (Map.Entry<String, List<AreaInfoVo>> entry : groupedByDistrict.entrySet()) {
-            result.add(new AreaInfoFinalVo(entry.getValue(), des)); // description 先为 null
-        }
+            // 转换为 List<AreaInfoFinalVo>
+            // TODO 各区AI描述待提供
+            List<AreaInfoFinalVo> result = new ArrayList<>();
+            for (Map.Entry<String, List<AreaInfoVo>> entry : groupedByDistrict.entrySet()) {
+                result.add(new AreaInfoFinalVo(entry.getValue(), des)); // description 先为默认
+            }
 
-        return result;
+            return result;
+        }
+        return new ArrayList<>();
     }
 }