From f37e7e5c00cb8196ff978f8eac2aab3fe9465b0d Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 03 Nov 2023 10:04:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java | 130 ++++++++++++++++++++++++++++++++++---------
1 files changed, 103 insertions(+), 27 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 4f2e462..7c2927b 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,8 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.poi.hssf.record.DVALRecord;
+import org.jetbrains.annotations.NotNull;
import org.springblade.common.node.TreeNode;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
@@ -33,6 +35,7 @@
import org.springblade.modules.house.service.IHouseRentalService;
import org.springblade.modules.house.service.IHouseholdLabelService;
import org.springblade.modules.house.service.IHouseholdService;
+import org.springblade.modules.house.vo.HouseParam;
import org.springblade.modules.house.vo.HouseRentalVO;
import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.place.service.IPlaceService;
@@ -116,43 +119,102 @@
/**
* 获取楼盘相关集合数据
- * @param name 名称
- * @param code 编号
- * @param type 类型 1：社区 2：小区 3：楼栋 4：户室
+ * @param houseParam
* @return
*/
@Override
- public Object getHousesList(String name, String code, Integer type,Integer addressType) {
+ public Object getHousesList(HouseParam houseParam) {
List<TreeNode> list = new ArrayList<>();
+ Map<String, Object> map = new HashMap<>(2);
// 查小区，场所
- if (type==1){
+ if (houseParam.getType()==1){
// 根据社区名称查询小区集合
- list = baseMapper.getDistrictList(name,code);
+ list = baseMapper.getDistrictList(houseParam.getName(),houseParam.getCode());
}
// 查楼栋，街路巷
- if (type==2){
- // 判断 code 长度，如果 code 长度大于 12 则为小区查楼栋，否则则按社区查街路巷
- if (code.length()>12){
- // 根据社区名称查询楼栋集合
- list = baseMapper.getBuildingList(name, code);
- }else {
- // 查询街路巷
- list = baseMapper.getStreetRuList(name, code);
- }
+ if (houseParam.getType()==2){
+ return getBuildLevelData(houseParam,map);
}
// 查户室
- if (type==3){
- // 判断地址类型
- if (addressType==1) {
- // 查询户室及住户相关信息，单元中包含住户
- return getUnitHouseholdList(name, code);
- }
- if (addressType==2) {
- // 根据街路巷编号查询街路巷门牌名称集合
- return baseMapper.getDoorplateNameList(name,code);
- }
+ if (houseParam.getType()==3){
+ return getHouseLevelData(houseParam, map);
}
return list;
+ }
+
+ /**
+ * 查询户室级别数据
+ * @param houseParam
+ * @param map
+ * @return
+ */
+ private Map<String, Object> getHouseLevelData(HouseParam houseParam, Map<String, Object> map) {
+ // 判断地址类型
+ if (houseParam.getAddressType()==1) {
+ List<FuncNode> aoiList = new ArrayList<>();
+ List<FuncNode> shopList = new ArrayList<>();
+ // 查询户室及住户相关信息，单元中包含住户,或者和单元平级的 商铺
+ List<FuncNode> householdList = getUnitHouseholdList(houseParam.getName(), houseParam.getCode());
+ // 遍历
+ if (householdList.size()>0){
+ for (FuncNode funcNode : householdList) {
+ if (funcNode.getAddressType()==1){
+ aoiList.add(funcNode);
+ }
+ if (funcNode.getAddressType()==2){
+ shopList.add(funcNode);
+ }
+ }
+ }
+ map.put("aoiList",aoiList);
+ map.put("shopList",shopList);
+ // 返回
+ return map;
+ }else{
+ // 根据街路巷编号查询街路巷门牌名称集合
+ List<FuncNode> doorplateNameList = baseMapper.getDoorplateNameList(houseParam.getName(), houseParam.getCode());
+ map.put("aoiList",new ArrayList<>());
+ map.put("shopList",doorplateNameList);
+ // 返回
+ return map;
+ }
+ }
+
+ /**
+ * 获取楼栋层级数据
+ * @param houseParam
+ * @param map
+ * @return
+ */
+ private Object getBuildLevelData(HouseParam houseParam,Map<String, Object> map) {
+ // 判断 code 长度，如果 code 长度大于 12 则为小区查楼栋/商铺，否则则按社区查街路巷
+ if (houseParam.getCode().length()>12){
+ List<TreeNode> aoiList = new ArrayList<>();
+ List<TreeNode> shopList = new ArrayList<>();
+ // 根据社区名称查询楼栋或者商铺的集合
+ List<TreeNode> list = baseMapper.getBuildingList(houseParam.getName(),houseParam.getCode());
+ if (list.size()>0){
+ for (TreeNode treeNode : list) {
+ if (treeNode.getAddressType()==1){
+ aoiList.add(treeNode);
+ }
+ if (treeNode.getAddressType()==2){
+ shopList.add(treeNode);
+ }
+ }
+ }
+ map.put("aoiList",aoiList);
+ map.put("shopList",shopList);
+ // 返回
+ return map;
+ }else {
+ // 查询街路巷
+ List<TreeNode> list = baseMapper.getStreetRuList(houseParam.getName(),houseParam.getCode());
+ map.put("aoiList",new ArrayList<>());
+ map.put("shopList",list);
+ // 返回
+ return map;
+ }
}
/**
@@ -165,21 +227,35 @@
List<FuncNode> list = new ArrayList<>();
// 查询户室及住户相关信息，单元中包含住户
List<FuncNode> funcNodes = baseMapper.getUnitHouseholdList(name,code);
+ // 遍历
+ List<FuncNode> aoiNodes = new ArrayList<>();
+ List<FuncNode> shopNodes = new ArrayList<>();
+ for (FuncNode funcNode : funcNodes) {
+ if (funcNode.getAddressType()==1){
+ aoiNodes.add(funcNode);
+ }
+ if (funcNode.getAddressType()==2){
+ shopNodes.add(funcNode);
+ }
+ }
// 处理，先按单元分组，再按楼层分组
- if (funcNodes.size()>0){
- Map<String, List<FuncNode>> listMap = funcNodes.stream().collect(Collectors.groupingBy(FuncNode::getFloor));
+ 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);
}
+ list.addAll(shopNodes);
// 返回
return list;
}
--
Gitblit v1.9.3