From b3b566ebdfed4005aaa513da3d5d2fd3924903cc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 31 Jan 2024 16:17:54 +0800
Subject: [PATCH] 拿不到地址总表数据，不设置网格信息
---
src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java | 65 +++++++++++++++++++++++++++++---
1 files changed, 59 insertions(+), 6 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..dd2e9cb 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
@@ -20,6 +20,8 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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;
@@ -135,11 +137,9 @@
*/
@Override
public List<TreeStringNode> getTree(RegionVO region) {
- Dept dept = deptService.getById(AuthUtil.getDeptId());
- if (null != dept) {
- region.setRegionCode(dept.getRegionCode());
- }
- return NodeTreeUtil.getStringNodeTree(baseMapper.getTreeList(region));
+ List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
+ Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
+ return NodeTreeUtil.getStringNodeTree(baseMapper.getTreeList(region,regionChildCodesList,isAdministrator));
}
/**
@@ -154,7 +154,7 @@
String regionCode = null;
if (null != dept) {
regionCode = dept.getRegionCode();
- if (StringUtils.isNotBlank(regionCode) && regionCode.equals("3611")) {
+ if (StringUtils.isNotBlank(regionCode) && regionCode.equals("361100")) {
regionCode = "361102";
}
}
@@ -170,4 +170,57 @@
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) {
+ return baseMapper.getRegionChildList(regionCode);
+ }
}
--
Gitblit v1.9.3