From 6ab8d5b7e1d3ebc55be1180db4dadea56b4c28f4 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 23 Nov 2023 17:54:00 +0800
Subject: [PATCH] 议题议事+公益报名
---
src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java | 50 +++++++++++++++++++++++++++-----------------------
1 files changed, 27 insertions(+), 23 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 86ef42f..2957ec3 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
@@ -23,7 +23,7 @@
import liquibase.repackaged.org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.constant.DictConstant;
-import org.springblade.common.node.TreeNode;
+import org.springblade.common.node.TreeStringNode;
import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
@@ -87,26 +87,28 @@
@Override
public Object getFuncList(Integer type,String roleName) {
HouseParam houseParam = new HouseParam();
+ String userId = AuthUtil.getUserId().toString();
+ houseParam.setUserId(userId);
List<String> stringList = new ArrayList<>();
if (null!=roleName && !roleName.equals("")){
houseParam.setRoleName(roleName);
- if (roleName.equals("网格员")){
+ if (roleName.equals("网格员") && !userId.equals("1726859808689696770")){
// 查询对应的房屋地址code
stringList = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
}
}
- List<TreeNode> list = new ArrayList<>();
+ List<TreeStringNode> list = new ArrayList<>();
if (null!=type) {
// 如果是网格管理员，系统管理员
if (type==1){
// 查询街道
- List<TreeNode> townList = baseMapper.getRegionListByGroupTwon(houseParam,stringList);
+ List<TreeStringNode> townList = baseMapper.getRegionListByGroupTwon(houseParam,stringList);
// 查询社区
- List<TreeNode> neiList = baseMapper.getRegionListByGroupNei(houseParam,stringList);
+ List<TreeStringNode> neiList = baseMapper.getRegionListByGroupNei(houseParam,stringList);
// 遍历
- for (TreeNode treeNode : townList) {
+ for (TreeStringNode treeNode : townList) {
// 遍历
- for (TreeNode node : neiList) {
+ for (TreeStringNode node : neiList) {
if (treeNode.getId().equals(node.getParentId())){
node.setHasChildren(false);
treeNode.getChildren().add(node);
@@ -129,10 +131,10 @@
* @param list
* @return
*/
- private Object getInhabitantInfo(List<TreeNode> list) {
+ private Object getInhabitantInfo(List<TreeStringNode> list) {
// 查询房屋集合信息
- List<TreeNode> houseNodeList = householdService.selectHouseNodeList(AuthUtil.getUserId());
- for (TreeNode treeNode : houseNodeList) {
+ List<TreeStringNode> houseNodeList = householdService.selectHouseNodeList(AuthUtil.getUserId());
+ for (TreeStringNode treeNode : houseNodeList) {
// 判断房屋类型类型
if (DictConstant.SMALL_DOORPLATE.equals(treeNode.getDoorplateType()) ||
(DictConstant.centre_DOORPLATE.equals(treeNode.getDoorplateType()) &&
@@ -143,8 +145,8 @@
}
}
// 查询场所集合信息
- List<TreeNode> placeNodeList = placeService.selectPlaceNodeList(AuthUtil.getUserId());
- for (TreeNode treeNode : placeNodeList) {
+ List<TreeStringNode> placeNodeList = placeService.selectPlaceNodeList(AuthUtil.getUserId());
+ for (TreeStringNode treeNode : placeNodeList) {
treeNode.setAddressType(2);
// if (DictConstant.SMALL_DOORPLATE.equals(treeNode.getDoorplateType()) ||
// (DictConstant.centre_DOORPLATE.equals(treeNode.getDoorplateType()) &&
@@ -156,13 +158,13 @@
}
if (houseNodeList.size() > 0 && placeNodeList.size() > 0) {
// 合并
- TreeNode houseNode = new TreeNode();
+ TreeStringNode houseNode = new TreeStringNode();
houseNode.setName("房屋");
houseNode.setId("1");
houseNode.setHasChildren(true);
houseNode.setChildren(houseNodeList);
- TreeNode placeNode = new TreeNode();
+ TreeStringNode placeNode = new TreeStringNode();
placeNode.setName("场所");
placeNode.setId("2");
placeNode.setHasChildren(true);
@@ -190,7 +192,7 @@
*/
@Override
public Object getHousesList(HouseParam houseParam) {
- List<TreeNode> list = new ArrayList<>();
+ List<TreeStringNode> list = new ArrayList<>();
Map<String, Object> map = new HashMap<>(2);
// 获取网格员对应的地址编号集合
List<String> stringList = getHouseCodeList(houseParam);
@@ -295,7 +297,7 @@
// 获取网格员对应的网格信息
getGridInfoByGridman(houseParam);
// 查询商超
- List<TreeNode> list = baseMapper.getPlaceRelList(houseParam);
+ List<TreeStringNode> list = baseMapper.getPlaceRelList(houseParam);
map.put("aoiList", new ArrayList<>());
map.put("shopList", list);
// 返回
@@ -304,15 +306,15 @@
List<String> stringList = getHouseCodeList(houseParam);
// 判断 code 长度，如果 code 长度大于 12 则为小区查楼栋/商铺，否则则按社区查街路巷
if (houseParam.getCode().length() > 12) {
- List<TreeNode> aoiList = new ArrayList<>();
- List<TreeNode> shopList = new ArrayList<>();
+ List<TreeStringNode> aoiList = new ArrayList<>();
+ List<TreeStringNode> shopList = new ArrayList<>();
// 根据社区名称查询楼栋或者商铺的集合
- List<TreeNode> list = baseMapper.getBuildingList(houseParam, stringList);
+ List<TreeStringNode> 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());
+ List<TreeStringNode> sortList = list.stream().sorted(Comparator.comparing(X -> StringUtils.getDigits(X.getName()))).collect(Collectors.toList());
if (list.size() > 0) {
- for (TreeNode treeNode : sortList) {
+ for (TreeStringNode treeNode : sortList) {
if (treeNode.getAddressType() == 1) {
aoiList.add(treeNode);
}
@@ -327,7 +329,7 @@
return map;
} else {
// 查询街路巷
- List<TreeNode> list = baseMapper.getStreetRuList(houseParam, stringList);
+ List<TreeStringNode> list = baseMapper.getStreetRuList(houseParam, stringList);
map.put("aoiList", new ArrayList<>());
map.put("shopList", list);
// 返回
@@ -537,8 +539,10 @@
*/
private List<String> getHouseCodeList(HouseParam houseParam) {
List<String> stringList = new ArrayList<>();
+ String userId = AuthUtil.getUserId().toString();
+ houseParam.setUserId(userId);
if (null != houseParam.getRoleName() && !houseParam.getRoleName().equals("")) {
- if (houseParam.getRoleName().equals("网格员")) {
+ if (houseParam.getRoleName().equals("网格员") && !userId.equals("1726859808689696770")) {
// 查询对应的房屋地址code
stringList = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
}
--
Gitblit v1.9.3