From e0cd68972b507e31bb4ea30ceb6f792b8601b8ee Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 20 Feb 2024 13:21:03 +0800
Subject: [PATCH] 接口权限
---
src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java | 47 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java
index dd2e9cb..b7efe4c 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java
@@ -17,8 +17,10 @@
package org.springblade.modules.system.service.impl;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.cache.SysCache;
@@ -35,6 +37,7 @@
import org.springblade.modules.system.mapper.RegionMapper;
import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IRegionService;
+import org.springblade.modules.system.vo.RegionParamVO;
import org.springblade.modules.system.vo.RegionVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -42,6 +45,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
import static org.springblade.common.cache.RegionCache.*;
@@ -136,9 +140,17 @@
* @return
*/
@Override
- public List<TreeStringNode> getTree(RegionVO region) {
+ public List<TreeStringNode> getTree(RegionParamVO region) {
List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
+ if (null!=region.getDeptNature()){
+ // 公安
+ if (region.getDeptNature()==1){
+ // 查询公安对应的辖区树
+ return NodeTreeUtil.getStringNodeTree(baseMapper.getPoliceTreeList());
+ }
+ }
+ // 非公安
return NodeTreeUtil.getStringNodeTree(baseMapper.getTreeList(region,regionChildCodesList,isAdministrator));
}
@@ -221,6 +233,37 @@
*/
@Override
public List<Region> getRegionChild(String regionCode) {
- return baseMapper.getRegionChildList(regionCode);
+ // 创建区域对象
+ List<Region> list = new ArrayList<>();
+ // 查询公安相关的区域数据
+ List<Region> regionList = baseMapper.getPoliceList();
+ if (regionList.size()>0) {
+ List<Region> policeList = treeRegionList(regionList,regionCode, list);
+ list.addAll(policeList);
+ }
+ // 查询综治区域集合
+ List<Region> regionChildList = baseMapper.getRegionChildList(regionCode);
+ list.addAll(regionChildList);
+ // 返回
+ return list;
+ }
+
+ /**
+ * 获取某个父节点下面的所有子节点
+ * @param regionList
+ * @param parentCode
+ * @param list
+ * @return
+ */
+ public static List<Region> treeRegionList( List<Region> regionList, String parentCode,List<Region> list){
+ for(Region region: regionList){
+ //遍历出父id等于参数的id，add进子节点集合
+ if(region.getParentCode().equals(parentCode)){
+ list.add(region);
+ //递归遍历下一级
+ treeRegionList(regionList,region.getCode(),list);
+ }
+ }
+ return list;
}
}
--
Gitblit v1.9.3