From cd0cc8910180826a92451c44a55c2799d7cdca81 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 10 Nov 2023 17:28:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java | 153 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 121 insertions(+), 32 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 f9b6dd3..f5e9048 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
@@ -20,6 +20,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import liquibase.repackaged.org.apache.commons.lang3.StringUtils;
import org.apache.poi.hssf.record.DVALRecord;
import org.jetbrains.annotations.NotNull;
import org.springblade.common.node.TreeNode;
@@ -43,10 +44,7 @@
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -75,7 +73,7 @@
/**
* 根据角色获取功能集合数据
- * @param type 1:查区域 2：查场所 3：查房屋
+ * @param type 1：查社区 2:查房屋和场所（居民角色）
* @param roleName
* @return
*/
@@ -99,21 +97,50 @@
// 查询区域数据，当前只有西市街道数据
return townList;
}
- // 如果是场所负责人
- if (type==2){
- // 查询场所集合信息
- list = placeService.selectPlaceNodeList(AuthUtil.getUserId());
- // 返回
- return list;
- }
// 如果是居民
- if (type==3){
- // 查询房屋集合信息
- list = householdService.selectHouseNodeList(AuthUtil.getUserId());
- // 返回
- return list;
+ if (type==2 || type==3){
+ return getInhabitantInfo(list);
}
}
+ return list;
+ }
+
+ /**
+ * 获取居民角色对应的房屋，场所信息
+ * @param list
+ * @return
+ */
+ private Object getInhabitantInfo(List<TreeNode> list) {
+ // 查询房屋集合信息
+ List<TreeNode> houseNodeList = householdService.selectHouseNodeList(AuthUtil.getUserId());
+ // 查询场所集合信息
+ List<TreeNode> placeNodeList = placeService.selectPlaceNodeList(AuthUtil.getUserId());
+ if (houseNodeList.size()>0 && placeNodeList.size()>0){
+ // 合并
+ TreeNode houseNode = new TreeNode();
+ houseNode.setName("房屋");
+ houseNode.setId("1");
+ houseNode.setHasChildren(true);
+ houseNode.setChildren(houseNodeList);
+
+ TreeNode placeNode = new TreeNode();
+ placeNode.setName("场所");
+ placeNode.setId("2");
+ placeNode.setHasChildren(true);
+ placeNode.setChildren(placeNodeList);
+
+ list.add(houseNode);
+ list.add(placeNode);
+ // 返回
+ return list;
+ }
+ if (houseNodeList.size()>0){
+ list = houseNodeList;
+ }
+ if (placeNodeList.size()>0){
+ list = placeNodeList;
+ }
+ // 返回
return list;
}
@@ -193,8 +220,10 @@
List<TreeNode> shopList = new ArrayList<>();
// 根据社区名称查询楼栋或者商铺的集合
List<TreeNode> list = baseMapper.getBuildingList(houseParam.getName(),houseParam.getCode());
+ // 排序 StringUtils.getDigits(X.getName()) 取出数字排序
+ List<TreeNode> sortList = list.stream().sorted(Comparator.comparing(X -> StringUtils.getDigits(X.getName()))).collect(Collectors.toList());
if (list.size()>0){
- for (TreeNode treeNode : list) {
+ for (TreeNode treeNode : sortList) {
if (treeNode.getAddressType()==1){
aoiList.add(treeNode);
}
@@ -240,20 +269,12 @@
}
// 处理，先按单元分组，再按楼层分组
if (aoiNodes.size()>0){
- Map<String, List<FuncNode>> listMap = aoiNodes.stream().collect(Collectors.groupingBy(FuncNode::getFloor));
- List<FuncNode> funcNodeList = new ArrayList<>();
- listMap.forEach((s, temps) -> {
- FuncNode funcNode = new FuncNode();
- funcNode.setFloor(s);
- funcNode.setChildren(temps);
- funcNode.setAddressType(1);
- funcNodeList.add(funcNode);
- });
- FuncNode funcNode = new FuncNode();
- funcNode.setUnitName("一单元");
- funcNode.setChildren(funcNodeList);
- funcNode.setAddressType(1);
- list.add(funcNode);
+ // 按单元分组
+ Map<String, List<FuncNode>> listMap = aoiNodes.stream().collect(Collectors.groupingBy(FuncNode::getUnitName));
+ // 单个单元
+ oneUnitHandle(list, listMap);
+ // 多个单元
+ moreUnitHandle(list, listMap);
}
list.addAll(shopNodes);
// 返回
@@ -261,6 +282,74 @@
}
/**
+ * 单个单元处理
+ * @param list
+ * @param listMap
+ */
+ private void oneUnitHandle(List<FuncNode> list, Map<String, List<FuncNode>> listMap) {
+ if (listMap.size()==1){
+ Set<String> keySet = listMap.keySet();
+ // 获取第一个key
+ String firstKey = null;
+ for (String key : keySet) {
+ firstKey = key;
+ break;
+ }
+ if (firstKey.equals("未知单元")){
+ // 取出数据按楼层分组
+ List<FuncNode> unitList = listMap.get(firstKey);
+ Map<String, List<FuncNode>> floorListMap = unitList.stream().collect(Collectors.groupingBy(FuncNode::getFloor));
+ List<FuncNode> funcNodeList = new ArrayList<>();
+ floorListMap.forEach((s, temps) -> {
+ FuncNode funcNode = new FuncNode();
+ funcNode.setFloor(s);
+ funcNode.setChildren(temps);
+ funcNode.setAddressType(1);
+ funcNodeList.add(funcNode);
+ });
+ FuncNode funcNode = new FuncNode();
+ funcNode.setUnitName("一单元");
+ funcNode.setChildren(funcNodeList);
+ funcNode.setAddressType(1);
+ list.add(funcNode);
+ }
+ }
+ }
+
+ /**
+ * 多单元处理
+ * @param list
+ * @param listMap
+ */
+ private void moreUnitHandle(List<FuncNode> list, Map<String, List<FuncNode>> listMap) {
+ // 不止一个单元
+ if (listMap.size()>1){
+ List<FuncNode> tempList = new ArrayList<>();
+ // 遍历
+ listMap.forEach((s, temps) -> {
+ FuncNode funcNode = new FuncNode();
+ funcNode.setUnitName(s);
+ funcNode.setAddressType(1);
+ // 按楼层分组
+ Map<String, List<FuncNode>> floorListMap = temps.stream().collect(Collectors.groupingBy(FuncNode::getFloor));
+ List<FuncNode> floorNodeList = new ArrayList<>();
+ floorListMap.forEach((floor, houseList) -> {
+ FuncNode floorNode = new FuncNode();
+ floorNode.setFloor(floor);
+ floorNode.setChildren(houseList);
+ floorNode.setAddressType(1);
+ floorNodeList.add(floorNode);
+ });
+ funcNode.setChildren(floorNodeList);
+ tempList.add(funcNode);
+ });
+ // 排序
+ List<FuncNode> sortList = tempList.stream().sorted(Comparator.comparing(X -> X.getUnitName())).collect(Collectors.toList());
+ list.addAll(sortList);
+ }
+ }
+
+ /**
* 查询房屋及出租详情信息
* @param code 门牌地址编号
* @return
--
Gitblit v1.9.3