From 0b1e9e70818f0e3eb32dd6c029d42d93236ecdc6 Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Wed, 03 Jul 2024 12:07:01 +0800
Subject: [PATCH] 数据同步新增连接池配置
---
src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 108 insertions(+), 10 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 2c3709b..07637de 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,9 +17,13 @@
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;
import org.springblade.common.node.TreeStringNode;
import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.core.log.exception.ServiceException;
@@ -33,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;
@@ -40,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.*;
@@ -134,12 +140,18 @@
* @return
*/
@Override
- public List<TreeStringNode> getTree(RegionVO region) {
- Dept dept = deptService.getById(AuthUtil.getDeptId());
- if (null != dept) {
- region.setRegionCode(dept.getRegionCode());
+ 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));
+ // 非公安
+ return NodeTreeUtil.getStringNodeTree(baseMapper.getTreeList(region,regionChildCodesList,isAdministrator));
}
/**
@@ -150,12 +162,14 @@
*/
@Override
public List<TreeStringNode> getTownTree(String code) {
- Dept dept = deptService.getById(AuthUtil.getDeptId());
String regionCode = null;
- if (null != dept) {
- regionCode = dept.getRegionCode();
- if (StringUtils.isNotBlank(regionCode) && regionCode.equals("3611")) {
- regionCode = "361102";
+ if (!AuthUtil.isAdministrator() && !AuthUtil.isAdmin()){
+ Dept dept = deptService.getById(AuthUtil.getDeptId());
+ if (null != dept) {
+ regionCode = dept.getRegionCode();
+ if (StringUtils.isNotBlank(regionCode) && regionCode.equals("361100")) {
+ regionCode = "361102";
+ }
}
}
return NodeTreeUtil.getStringNodeTree(baseMapper.getTownTree(regionCode));
@@ -170,4 +184,88 @@
public List<TreeStringNode> getBaseTree() {
return NodeTreeUtil.getStringNodeTree(baseMapper.getBaseTree());
}
+
+ /**
+ * 区划数据处理
+ */
+ @Override
+ public void regionDataHandle() {
+ // 查询所有区划数据
+ List<Region> regionList = baseMapper.getCodeLess12DataList();
+ // 遍历处理
+ for (Region region : regionList) {
+ // 设置code
+ region.setCode(StringUtils.rightPad(region.getCode(),12,"0"));
+ // 设置parent_code
+ region.setParentCode(StringUtils.rightPad(region.getParentCode(),12,"0"));
+ // 设置Ancestors
+ setAncestors(region);
+ // 设置ProvinceCode
+ region.setProvinceCode(StringUtils.rightPad(region.getProvinceCode(),12,"0"));
+ // 设置CityCode
+ region.setCityCode(StringUtils.rightPad(region.getCityCode(),12,"0"));
+ // 设置DistrictCode
+ region.setDistrictCode(StringUtils.rightPad(region.getDistrictCode(),12,"0"));
+ // 设置TownCode
+ region.setTownCode(StringUtils.rightPad(region.getTownCode(),12,"0"));
+ // 设置VillageCode
+ region.setVillageCode(StringUtils.rightPad(region.getVillageCode(),12,"0"));
+ // 更新
+ updateById(region);
+ }
+ }
+
+ /**
+ * Ancestors 字段处理
+ * @param region
+ */
+ private void setAncestors(Region region) {
+ String[] split = region.getAncestors().split(",");
+ List<String> list = new ArrayList<>();
+ for (String s : split) {
+ list.add(StringUtils.rightPad(s,12,"0"));
+ }
+ region.setAncestors(Strings.join(list, ','));
+ }
+
+ /**
+ * 查询下级区域(拼接网格)
+ * @param regionCode
+ * @return
+ */
+ @Override
+ public List<Region> getRegionChild(String 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