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> getList(AreaInfoBo bo) { List 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 areaInfoVos = this.queryList(bo); - // 按 district(区域)分组 - Map> groupedByDistrict = areaInfoVos.stream() - .collect(Collectors.groupingBy(AreaInfoVo::getDistrict)); + if (CollectionUtil.isNotEmpty(areaInfoVos)){ + // 按 district(区域)分组 + Map> groupedByDistrict = areaInfoVos.stream() + .collect(Collectors.groupingBy(AreaInfoVo::getDistrict)); - // 转换为 List - List result = new ArrayList<>(); - for (Map.Entry> entry : groupedByDistrict.entrySet()) { - result.add(new AreaInfoFinalVo(entry.getValue(), des)); // description 先为 null - } + // 转换为 List + // TODO 各区AI描述待提供 + List result = new ArrayList<>(); + for (Map.Entry> entry : groupedByDistrict.entrySet()) { + result.add(new AreaInfoFinalVo(entry.getValue(), des)); // description 先为默认 + } - return result; + return result; + } + return new ArrayList<>(); } }