diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A1.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A1.java index b1c5c693..4dc3c385 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A1.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A1.java @@ -90,6 +90,10 @@ public class A1 { parentPathName = file.getParentFile().getParentFile().getName(); cityName = ru.getCityOrAreaName(parentPathName); } + if (StrKit.isBlank(cityName) || cityName.equals(areaName)) { + parentPathName = file.getParentFile().getParentFile().getParentFile().getName(); + cityName = ru.getCityOrAreaName(parentPathName); + } if (StrKit.isBlank(cityName)||StrKit.isBlank(areaName)) { System.out.println("发现异常数据,请人工处理:" + file.getName()); System.exit(0); diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A2.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A2.java index cc52cd7f..a945ca0e 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A2.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A2.java @@ -90,6 +90,10 @@ public class A2 { parentPathName = file.getParentFile().getParentFile().getName(); cityName = ru.getCityOrAreaName(parentPathName); } + if (StrKit.isBlank(cityName) || cityName.equals(areaName)) { + parentPathName = file.getParentFile().getParentFile().getParentFile().getName(); + cityName = ru.getCityOrAreaName(parentPathName); + } if (StrKit.isBlank(cityName) || StrKit.isBlank(areaName)) { System.out.println("发现异常数据,请人工处理:" + file.getName()); System.exit(0); diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A3.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A3.java index 1c432bd5..2c3bef20 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A3.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A3.java @@ -90,6 +90,10 @@ public class A3 { parentPathName = file.getParentFile().getParentFile().getName(); cityName = ru.getCityOrAreaName(parentPathName); } + if (StrKit.isBlank(cityName) || cityName.equals(areaName)) { + parentPathName = file.getParentFile().getParentFile().getParentFile().getName(); + cityName = ru.getCityOrAreaName(parentPathName); + } if (StrKit.isBlank(cityName) || StrKit.isBlank(areaName)) { System.out.println("发现异常数据,请人工处理:" + file.getName()); System.exit(0); diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A4.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A4.java index c612b80d..54e413e9 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A4.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A4.java @@ -90,6 +90,10 @@ public class A4 { parentPathName = file.getParentFile().getParentFile().getName(); cityName = ru.getCityOrAreaName(parentPathName); } + if (StrKit.isBlank(cityName) || cityName.equals(areaName)) { + parentPathName = file.getParentFile().getParentFile().getParentFile().getName(); + cityName = ru.getCityOrAreaName(parentPathName); + } if (StrKit.isBlank(cityName) || StrKit.isBlank(areaName)) { System.out.println("发现异常数据,请人工处理:" + file.getName()); System.exit(0); diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A5.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A5.java index b3a1a9b8..3e09f753 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A5.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A5.java @@ -90,6 +90,10 @@ public class A5 { parentPathName = file.getParentFile().getParentFile().getName(); cityName = ru.getCityOrAreaName(parentPathName); } + if (StrKit.isBlank(cityName) || cityName.equals(areaName)) { + parentPathName = file.getParentFile().getParentFile().getParentFile().getName(); + cityName = ru.getCityOrAreaName(parentPathName); + } if (StrKit.isBlank(cityName)||StrKit.isBlank(areaName)) { System.out.println("发现异常数据,请人工处理:" + file.getName()); System.exit(0); diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A6.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A6.java index 7b7aa23c..83a62d7f 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A6.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A6.java @@ -90,6 +90,10 @@ public class A6 { parentPathName = file.getParentFile().getParentFile().getName(); cityName = ru.getCityOrAreaName(parentPathName); } + if (StrKit.isBlank(cityName) || cityName.equals(areaName)) { + parentPathName = file.getParentFile().getParentFile().getParentFile().getName(); + cityName = ru.getCityOrAreaName(parentPathName); + } if (StrKit.isBlank(cityName) || StrKit.isBlank(areaName)) { System.out.println("发现异常数据,请人工处理:" + file.getName()); System.exit(0);