From 365b5ad817c9c8a2992d505aa39eccfa2be0460e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 09 Nov 2023 09:39:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java | 235 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 199 insertions(+), 36 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 9973c01..e2b5aca 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
@@ -16,27 +16,35 @@
*/
package org.springblade.modules.doorplateAddress.service.impl;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
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.common.utils.NodeTreeUtil;
-import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.StringUtil;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
import org.springblade.modules.doorplateAddress.mapper.DoorplateAddressMapper;
import org.springblade.modules.doorplateAddress.service.IDoorplateAddressService;
+import org.springblade.modules.doorplateAddress.vo.DoorplateAddressVOTree;
import org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO;
import org.springblade.modules.doorplateAddress.vo.FuncNode;
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;
import org.springframework.beans.factory.annotation.Autowired;
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.stream.Collectors;
@@ -67,7 +75,7 @@
/**
* 根据角色获取功能集合数据
- * @param type 1:查区域 2：查场所 3：查房屋
+ * @param type 1：查社区 2:查房屋和场所（居民角色）
* @param roleName
* @return
*/
@@ -78,9 +86,9 @@
// 如果是网格管理员，系统管理员
if (type==1){
// 查询街道
- List<TreeNode> townList = baseMapper.getRegionListByGrouyTwon();
+ List<TreeNode> townList = baseMapper.getRegionListByGroupTwon();
// 查询社区
- List<TreeNode> neiList = baseMapper.getRegionListByGrouyNei();
+ List<TreeNode> neiList = baseMapper.getRegionListByGroupNei();
TreeNode node = townList.get(0);
node.setHasChildren(true);
// 遍历
@@ -91,50 +99,151 @@
// 查询区域数据，当前只有西市街道数据
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){
+ 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;
+ }
+
+ /**
* 获取楼盘相关集合数据
- * @param name 名称
- * @param code 编号
- * @param type 类型 1：社区 2：小区 3：楼栋 4：户室
+ * @param houseParam
* @return
*/
@Override
- public Object getHousesList(String name, String code, Integer type) {
+ 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){
- // 根据社区名称查询楼栋集合
- list = baseMapper.getBuildingList(name,code);
+ // 查楼栋，街路巷
+ if (houseParam.getType()==2){
+ return getBuildLevelData(houseParam,map);
}
// 查户室
- if (type==3){
- // 查询户室及住户相关信息，单元中包含住户
- return getUnitHouseholdList(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;
+ }
}
/**
@@ -147,21 +256,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;
}
@@ -175,11 +298,51 @@
public Object getHouseRentInfo(String code) {
// 先查询门牌信息
DoorplateAddressVO doorplateAddressDetailVO = baseMapper.getDoorplateAddressDetailByCode(code);
- // 查询房屋出租情况
- List<HouseRentalVO> houseRentalVOS = houseRentalService.getHouseRentalListByCode(code);
- // 设置数据
- doorplateAddressDetailVO.setHouseRentalList(houseRentalVOS);
+ if(null!= doorplateAddressDetailVO) {
+ // 查询房屋出租情况
+ List<HouseRentalVO> houseRentalVOS = houseRentalService.getHouseRentalListByCode(code);
+ // 查询房屋人员情况
+ List<HouseholdVO> householdVOS = householdService.getHouseholdListByCode(code);
+ // 设置数据
+ doorplateAddressDetailVO.setHouseRentalList(houseRentalVOS);
+ doorplateAddressDetailVO.setHouseholdList(householdVOS);
+ }
// 返回
return doorplateAddressDetailVO;
}
+
+ @Override
+ public List<DoorplateAddressVOTree> getDoorplateAddressList(String code, String type) {
+
+ //西市街道 万达社区 滨江西路66号 万达华府 26栋
+ List<DoorplateAddressVOTree> list = new ArrayList<>();
+
+
+ if (type.equals("townStreet")){
+ //获取所有街道街道
+ list = baseMapper.getTownStreetVOTreeList();
+ }else if (type.equals("nei")){
+ list= baseMapper.getNeiVOTreeList(code);
+ }else if (type.equals("streetRu")){
+ list = baseMapper.getStreetRuVOTreeList(code);
+ }else if (type.equals("district")){
+ list=baseMapper.getDistrictVOTreeList(code);
+ }else if (type.equals("building")){
+ list = baseMapper.getBuildingVOTreeList(code);
+ }
+
+ return list;
+ }
+
+ /**
+ * 根据参数获取地址详情
+ * @return
+ */
+ @Override
+ public DoorplateAddressVO getDoorplateAddressDetail(DoorplateAddressVO doorplateAddressVO) {
+ //根据参数获取地址详情
+ DoorplateAddressVO doorplateAddress = baseMapper.getDoorplateAddressDetail(doorplateAddressVO);
+ // 返回
+ return doorplateAddress;
+ }
}
--
Gitblit v1.9.3