From b474579c0fc365a28f8c3a9f884ee28ca88f5a37 Mon Sep 17 00:00:00 2001
From: HuangHai <10402852@qq.com>
Date: Wed, 9 Apr 2025 14:56:02 +0800
Subject: [PATCH] 'commit'

---
 .../Data/{SchoolCount_2019.json => SchoolCount/2019.json}     | 0
 .../com/dsideal/base/Tools/JkyNewData/SchoolCountSummary.java | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename src/main/java/com/dsideal/base/Tools/JkyNewData/Data/{SchoolCount_2019.json => SchoolCount/2019.json} (100%)

diff --git a/src/main/java/com/dsideal/base/Tools/JkyNewData/Data/SchoolCount_2019.json b/src/main/java/com/dsideal/base/Tools/JkyNewData/Data/SchoolCount/2019.json
similarity index 100%
rename from src/main/java/com/dsideal/base/Tools/JkyNewData/Data/SchoolCount_2019.json
rename to src/main/java/com/dsideal/base/Tools/JkyNewData/Data/SchoolCount/2019.json
diff --git a/src/main/java/com/dsideal/base/Tools/JkyNewData/SchoolCountSummary.java b/src/main/java/com/dsideal/base/Tools/JkyNewData/SchoolCountSummary.java
index 0763f930..29b4836d 100644
--- a/src/main/java/com/dsideal/base/Tools/JkyNewData/SchoolCountSummary.java
+++ b/src/main/java/com/dsideal/base/Tools/JkyNewData/SchoolCountSummary.java
@@ -23,7 +23,7 @@ import static com.dsideal.base.Tools.JkyNewData.Util.CommonUtil.log;
 
 public class SchoolCountSummary {
     // 配置文件
-    public static final String configDir = "D:/dsWork/YunNanDsBase/src/main/java/com/dsideal/base/Tools/JkyNewData/Data/";
+    public static final String configDir = "D:/dsWork/YunNanDsBase/src/main/java/com/dsideal/base/Tools/JkyNewData/Data/SchoolCount/";
     public static final String excelPath = "D:/dsWork/2025年收集的人口与教育数据库（20250328）/2015-2020年的数据/基础教育";
 
 
@@ -40,7 +40,7 @@ public class SchoolCountSummary {
 
         // 四、获取所有配置文件
         File dir = new File(configDir);
-        File[] configFiles = dir.listFiles((d, name) -> name.matches("SchoolCount_\\d{4}\\.json"));
+        File[] configFiles = dir.listFiles((d, name) -> name.matches("\\d{4}\\.json"));
 
         if (configFiles != null) {
             for (File configFile : configFiles) {