From 82e222ae8a60afd3d0237b4f987f8c850834dad5 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 11 Nov 2023 19:16:51 +0800
Subject: [PATCH] 行政区，楼盘数据过滤，报事报修添加任务房屋地址编码
---
src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 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 dadb38f..166e487 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
@@ -29,6 +29,7 @@
import org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO;
import org.springblade.modules.doorplateAddress.vo.DoorplateAddressVOTree;
import org.springblade.modules.doorplateAddress.vo.FuncNode;
+import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.house.service.IHouseRentalService;
import org.springblade.modules.house.service.IHouseholdService;
import org.springblade.modules.house.vo.HouseParam;
@@ -59,6 +60,9 @@
@Autowired
private IHouseRentalService houseRentalService;
+ @Autowired
+ private IGridService gridService;
+
@Override
public IPage<DoorplateAddressVO> selectDoorplateAddressPage(IPage<DoorplateAddressVO> page, DoorplateAddressVO doorplateAddress) {
@@ -73,14 +77,23 @@
*/
@Override
public Object getFuncList(Integer type,String roleName) {
+ HouseParam houseParam = new HouseParam();
+ List<String> stringList = new ArrayList<>();
+ if (null!=roleName && !roleName.equals("")){
+ houseParam.setRoleName(roleName);
+ if (roleName.equals("网格员")){
+ // 查询对应的房屋地址code
+ stringList = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
+ }
+ }
List<TreeNode> list = new ArrayList<>();
if (null!=type) {
// 如果是网格管理员，系统管理员
if (type==1){
// 查询街道
- List<TreeNode> townList = baseMapper.getRegionListByGroupTwon();
+ List<TreeNode> townList = baseMapper.getRegionListByGroupTwon(houseParam,stringList);
// 查询社区
- List<TreeNode> neiList = baseMapper.getRegionListByGroupNei();
+ List<TreeNode> neiList = baseMapper.getRegionListByGroupNei(houseParam,stringList);
// 遍历
for (TreeNode treeNode : townList) {
// 遍历
@@ -91,7 +104,7 @@
}
}
}
- // 查询区域数据，当前只有西市街道数据
+ // 查询区域数据
return townList;
}
// 如果是居民
@@ -170,10 +183,17 @@
public Object getHousesList(HouseParam houseParam) {
List<TreeNode> list = new ArrayList<>();
Map<String, Object> map = new HashMap<>(2);
+ List<String> stringList = new ArrayList<>();
+ if (null!=houseParam.getRoleName() && !houseParam.getRoleName().equals("")){
+ if (houseParam.getRoleName().equals("网格员")){
+ // 查询对应的房屋地址code
+ stringList = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
+ }
+ }
// 查小区，场所
if (houseParam.getType()==1){
// 根据社区名称查询小区集合
- list = baseMapper.getDistrictList(houseParam.getName(),houseParam.getCode());
+ list = baseMapper.getDistrictList(houseParam,stringList);
}
// 查楼栋，街路巷
if (houseParam.getType()==2){
@@ -231,12 +251,20 @@
* @return
*/
private Object getBuildLevelData(HouseParam houseParam,Map<String, Object> map) {
+ List<String> stringList = new ArrayList<>();
+ if (null!=houseParam.getRoleName() && !houseParam.getRoleName().equals("")){
+ if (houseParam.getRoleName().equals("网格员")){
+ // 查询对应的房屋地址code
+ stringList = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
+ }
+ }
// 判断 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());
+
+ List<TreeNode> list = baseMapper.getBuildingList(houseParam,stringList);
// 排序 StringUtils.getDigits(X.getName()) 取出数字排序
List<TreeNode> sortList = list.stream().sorted(Comparator.comparing(X -> StringUtils.getDigits(X.getName()))).collect(Collectors.toList());
if (list.size()>0){
@@ -255,7 +283,7 @@
return map;
}else {
// 查询街路巷
- List<TreeNode> list = baseMapper.getStreetRuList(houseParam.getName(),houseParam.getCode());
+ List<TreeNode> list = baseMapper.getStreetRuList(houseParam,stringList);
map.put("aoiList",new ArrayList<>());
map.put("shopList",list);
// 返回
--
Gitblit v1.9.3