From d46ca134f82fd106bfbbbd71aef7184805e6d7e7 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 19 Jan 2024 09:17:54 +0800
Subject: [PATCH] bug 修复
---
src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java | 66 +++++++++++++++++++++++++++++++--
1 files changed, 62 insertions(+), 4 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 89ce8dd..f2f3053 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
@@ -19,8 +19,8 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
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.node.TreeLongNode;
import org.springblade.common.node.TreeStringNode;
import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.core.log.exception.ServiceException;
@@ -28,7 +28,6 @@
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringPool;
-import org.springblade.modules.district.vo.DistrictVO;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.Region;
import org.springblade.modules.system.excel.RegionExcel;
@@ -131,13 +130,14 @@
/**
* 树列表
+ *
* @param region
* @return
*/
@Override
public List<TreeStringNode> getTree(RegionVO region) {
Dept dept = deptService.getById(AuthUtil.getDeptId());
- if (null!=dept){
+ if (null != dept) {
region.setRegionCode(dept.getRegionCode());
}
return NodeTreeUtil.getStringNodeTree(baseMapper.getTreeList(region));
@@ -145,6 +145,7 @@
/**
* 树列表(获取当前树）
+ *
* @param code
* @return
*/
@@ -152,18 +153,75 @@
public List<TreeStringNode> getTownTree(String code) {
Dept dept = deptService.getById(AuthUtil.getDeptId());
String regionCode = null;
- if (null!=dept){
+ if (null != dept) {
regionCode = dept.getRegionCode();
+ if (StringUtils.isNotBlank(regionCode) && regionCode.equals("361100000000")) {
+ regionCode = "361102000000";
+ }
}
return NodeTreeUtil.getStringNodeTree(baseMapper.getTownTree(regionCode));
}
/**
* 树列表(包含省市县三级)
+ *
* @return
*/
@Override
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.selectList(Wrappers.<Region>query().lambda().like(Region::getAncestors, regionCode));
+ }
}
--
Gitblit v1.9.3