Browse Source

各区目标实现-增加判空条件

environment_dev
gjh 4 weeks ago
parent
commit
19681d9d5f
  1. 3
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/AreaInfoController.java
  2. 7
      ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/AreaInfoServiceImpl.java

3
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); ExcelUtil.exportExcel(list, "区域信息", AreaInfoVo.class, response);
} }
/**
* 获取区域信息列表+AI描述
*/
@GetMapping("/getList") @GetMapping("/getList")
public R<List<AreaInfoFinalVo>> getList(AreaInfoBo bo) { public R<List<AreaInfoFinalVo>> getList(AreaInfoBo bo) {
List<AreaInfoFinalVo> rs = areaInfoService.getList(bo); List<AreaInfoFinalVo> rs = areaInfoService.getList(bo);

7
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/AreaInfoServiceImpl.java

@ -1,5 +1,6 @@
package org.dromara.demo.service.impl; 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.MapstructUtils;
import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
@ -145,16 +146,20 @@ public class AreaInfoServiceImpl implements IAreaInfoService {
// 从数据库中获取的所有区域信息 // 从数据库中获取的所有区域信息
List<AreaInfoVo> areaInfoVos = this.queryList(bo); List<AreaInfoVo> areaInfoVos = this.queryList(bo);
if (CollectionUtil.isNotEmpty(areaInfoVos)){
// 按 district(区域)分组 // 按 district(区域)分组
Map<String, List<AreaInfoVo>> groupedByDistrict = areaInfoVos.stream() Map<String, List<AreaInfoVo>> groupedByDistrict = areaInfoVos.stream()
.collect(Collectors.groupingBy(AreaInfoVo::getDistrict)); .collect(Collectors.groupingBy(AreaInfoVo::getDistrict));
// 转换为 List<AreaInfoFinalVo> // 转换为 List<AreaInfoFinalVo>
// TODO 各区AI描述待提供
List<AreaInfoFinalVo> result = new ArrayList<>(); List<AreaInfoFinalVo> result = new ArrayList<>();
for (Map.Entry<String, List<AreaInfoVo>> entry : groupedByDistrict.entrySet()) { for (Map.Entry<String, List<AreaInfoVo>> entry : groupedByDistrict.entrySet()) {
result.add(new AreaInfoFinalVo(entry.getValue(), des)); // description 先为 null result.add(new AreaInfoFinalVo(entry.getValue(), des)); // description 先为默认
} }
return result; return result;
} }
return new ArrayList<>();
}
} }

Loading…
Cancel
Save