From c59eeba06fa3ff353cd7c9016aa0a0b25a6931a5 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 04 Jan 2024 18:16:06 +0800
Subject: [PATCH] 商超查询，房屋查询，场所查询修改
---
src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java b/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
index 703f7dc..3b2f91b 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
@@ -327,8 +327,31 @@
getGridInfoByGridman(houseParam);
// 查询商超
List<FuncNode> doorplateNameList = baseMapper.getPlaceRelDetailList(houseParam);
+ // 按单元(网格)分组
+ Map<String, List<FuncNode>> listMap = doorplateNameList.stream().collect(Collectors.groupingBy(FuncNode::getUnitName));
+ //
+ List<FuncNode> tempList = new ArrayList<>();
+ // 遍历
+ listMap.forEach((s, temps) -> {
+ FuncNode funcNode = new FuncNode();
+ funcNode.setUnitName(s);
+ funcNode.setAddressType(4);
+ funcNode.setUnitCode(temps.get(0).getUnitCode());
+ funcNode.setChildren(temps);
+ // 查询网格对应的排序
+ QueryWrapper<GridEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("community_code",funcNode.getUnitCode()).eq("grid_name",funcNode.getUnitName());
+ // 查询网格
+ GridEntity one = gridService.getOne(wrapper);
+ if (null!=one){
+ funcNode.setSort(one.getSort());
+ }
+ tempList.add(funcNode);
+ });
+ // 排序
+ List<FuncNode> sortList = tempList.stream().sorted(Comparator.comparing(X -> X.getSort())).collect(Collectors.toList());
map.put("aoiList",new ArrayList<>());
- map.put("shopList",doorplateNameList);
+ map.put("shopList",sortList);
// 返回
return map;
}
--
Gitblit v1.9.3