From 66bfbdb9251c22ffa2b5f05595a76a3547a2f5eb Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 09 Feb 2026 11:00:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-system/src/main/java/org/sxkj/system/service/impl/RegionServiceImpl.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/drone-service/drone-system/src/main/java/org/sxkj/system/service/impl/RegionServiceImpl.java b/drone-service/drone-system/src/main/java/org/sxkj/system/service/impl/RegionServiceImpl.java
index 3e42505..80a9189 100644
--- a/drone-service/drone-system/src/main/java/org/sxkj/system/service/impl/RegionServiceImpl.java
+++ b/drone-service/drone-system/src/main/java/org/sxkj/system/service/impl/RegionServiceImpl.java
@@ -71,6 +71,33 @@
if (regionParentCode.startsWith(MAIN_CODE)) {
region.setParentCode(StringUtil.removePrefix(regionParentCode, MAIN_CODE));
}
+ region.setCityName("吉安市");
+ region.setCityCode("360800000000");
+ region.setProvinceCode("360000000000");
+ region.setProvinceName("江西省");
+ if (region.getRegionLevel().equals(DISTRICT_LEVEL)) {
+ region.setDistrictCode(region.getCode());
+ region.setDistrictName(region.getName());
+ }
+ if (region.getRegionLevel().equals(TOWN_LEVEL)) {
+ String parentCode = region.getParentCode();
+ Region byCode = getByCode(parentCode);
+ region.setDistrictCode(byCode.getCode());
+ region.setDistrictName(byCode.getName());
+ region.setTownCode(region.getCode());
+ region.setTownName(region.getName());
+ }
+ if (region.getRegionLevel().equals(VILLAGE_LEVEL)) {
+ String parentCode = region.getParentCode();
+ Region byCode = getByCode(parentCode);
+ region.setTownCode(byCode.getCode());
+ region.setTownName(byCode.getName());
+ Region byCode2 = getByCode(byCode.getParentCode());
+ region.setDistrictCode(byCode2.getCode());
+ region.setDistrictName(byCode2.getName());
+ region.setVillageCode(region.getCode());
+ region.setVillageName(region.getName());
+ }
// 查询是否已存在
Long cnt = baseMapper.selectCount(Wrappers.<Region>query().lambda().eq(Region::getCode, region.getCode()));
if (cnt > 0L) {
--
Gitblit v1.9.3