From 85985dbf68d6e3438955d400b6abede8bede1489 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Wed, 20 Nov 2024 10:15:33 +0800
Subject: [PATCH] 'commit'

---
 ...��镇&乡村人口变化及预测-双.xlsx | Bin 4450 -> 4450 bytes
 .../dsideal/base/Tools/FillData/Area/A8.java  |   9 ++-------
 .../dsideal/base/Tools/FillData/Area/A9.java  |  12 ++++--------
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/Doc/待处理/区/【9】城镇&乡村人口变化及预测-双/城镇&乡村人口变化及预测-双.xlsx b/Doc/待处理/区/【9】城镇&乡村人口变化及预测-双/城镇&乡村人口变化及预测-双.xlsx
index 0af450b4a4b2299b769642bb007e32880daa4459..a903bef1d5d088ffc41a2776efac5070e6a14d53 100644
GIT binary patch
delta 165
zcmaE)^hk*}z?+#xgn@&DgW-B$$wuBvMrI(rxsy>E%$U5K=^R*~g4qcovzJAf2`qA%
z?IuKIJ%=cSahy{M!g#`E$^ud|S%%*ZOvmz@f$3@d)?oSyzYUlc7O)4?p#m0QdV+uz
Nm_94u3Z_K`eF20sI;8*r

delta 165
zcmaE)^hk*}z?+#xgn@&DgCQ}tcq4BmBQucR+{q{nW=vkrbPg;~!R!Q)*~=o#1Qxl>
zb`v79o<kJEIL;{rVLah7WdW&~EW>XHrepcd!1OeJYcPF<-v&$z3)q9{Pyq`tJwd<<
NOrI5S1=FH}z5qS^Gamo|

diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A8.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A8.java
index 1fd63f7c..67fc123c 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A8.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A8.java
@@ -76,13 +76,7 @@ public class A8 {
                 //县区名称
                 String areaName = ru.getAreaName(file.getName());
                 //市州名称
-                //此文件的路径中最后一层的目录名称，应该是带着市州名称 ，把最后一层子目录的名称提出
-                String parentPathName = file.getParentFile().getName();
-                String cityName = ru.getCityName(parentPathName);
-                if (StrKit.isBlank(cityName) || cityName.equals(areaName)) {
-                    parentPathName = file.getParentFile().getParentFile().getName();
-                    cityName = ru.getCityName(parentPathName);
-                }
+                String cityName = ru.getCityNameByAreaName(areaName);
 
                 if (StrKit.isBlank(cityName) || StrKit.isBlank(areaName)) {
                     System.out.println("发现异常数据，请人工处理：" + file.getName());
@@ -95,6 +89,7 @@ public class A8 {
                         ExcelKit.getChartData(file.getAbsolutePath(), firstChartNumber, 6);//从2017年开始
 
 
+                ExcelKit.printTable(source1);
             }
         }
         //保存文件
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A9.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A9.java
index 78917453..b524c4c2 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A9.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A9.java
@@ -73,16 +73,10 @@ public class A9 {
                 if (flag) continue;
                 //只关心发展规模数据的表格
                 if (!file.getName().contains(fileNameKey)) continue;
-                //县区名称
+                 //县区名称
                 String areaName = ru.getAreaName(file.getName());
                 //市州名称
-                //此文件的路径中最后一层的目录名称，应该是带着市州名称 ，把最后一层子目录的名称提出
-                String parentPathName = file.getParentFile().getName();
-                String cityName = ru.getCityName(parentPathName);
-                if (StrKit.isBlank(cityName) || cityName.equals(areaName)) {
-                    parentPathName = file.getParentFile().getParentFile().getName();
-                    cityName = ru.getCityName(parentPathName);
-                }
+                String cityName = ru.getCityNameByAreaName(areaName);
 
                 if (StrKit.isBlank(cityName) || StrKit.isBlank(areaName)) {
                     System.out.println("发现异常数据，请人工处理：" + file.getName());
@@ -98,6 +92,8 @@ public class A9 {
                 List<List<String>> source3 =
                         ExcelKit.getChartData(file.getAbsolutePath(), chartNumber - 1, 6);
 
+                ExcelKit.printTable(source2);
+                ExcelKit.printTable(source3);
             }
         }
         //保存文件