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

---
 .../base/Tools/JkyNewData/Data/SchoolCount.json      |  1 +
 .../base/Tools/JkyNewData/SchoolCountSummary.java    | 12 +++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/dsideal/base/Tools/JkyNewData/Data/SchoolCount.json b/src/main/java/com/dsideal/base/Tools/JkyNewData/Data/SchoolCount.json
index 3b2dee47..cc4497b6 100644
--- a/src/main/java/com/dsideal/base/Tools/JkyNewData/Data/SchoolCount.json
+++ b/src/main/java/com/dsideal/base/Tools/JkyNewData/Data/SchoolCount.json
@@ -1,5 +1,6 @@
 {
   "2019": {
+    "skipRows": 7,
     "基教小学": {
       "schoolName": {
         "index": 1,
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 05f4c4e2..ff8b18b2 100644
--- a/src/main/java/com/dsideal/base/Tools/JkyNewData/SchoolCountSummary.java
+++ b/src/main/java/com/dsideal/base/Tools/JkyNewData/SchoolCountSummary.java
@@ -19,6 +19,9 @@ import java.util.List;
 import java.util.Map;
 
 public class SchoolCountSummary {
+    // 配置文件
+    public static final String configPath = "D:/dsWork/YunNanDsBase/src/main/java/com/dsideal/base/Tools/JkyNewData/Data/SchoolCount.json";
+    public static final String excelPath = "D:/dsWork/2025年收集的人口与教育数据库（20250328）/2015-2020年的数据/基础教育";
 
     public static void main(String[] args) throws FileNotFoundException {
         // 一、关闭日志输出
@@ -27,13 +30,12 @@ public class SchoolCountSummary {
         // 二、初始化数据库连接
         LocalMysqlConnectUtil.Init();
 
-        // 读取配置文件
-        String configPath = "D:/dsWork/YunNanDsBase/src/main/java/com/dsideal/base/Tools/JkyNewData/Data/SchoolCount.json";
-        String excelPath = "D:/dsWork/2025年收集的人口与教育数据库（20250328）/2015-2020年的数据/基础教育";
+        // 三、开始读取数据
         JSONObject config = JSON.parseObject(new FileReader(configPath));
-
         // 遍历年份
         for (String year : config.keySet()) {
+            //表头的行数
+            int skipRows = config.getJSONObject(year).getIntValue("skipRows");
             JSONObject yearConfig = config.getJSONObject(year);
             String filePath = String.format(excelPath + "/%s.xlsx", year);
 
@@ -57,7 +59,7 @@ public class SchoolCountSummary {
                 }
 
                 // 处理当前学校类型的数据
-                allResults.put(schoolType, processSheet(filePath, schoolType, 7, columnConfigs));
+                allResults.put(schoolType, processSheet(filePath, schoolType, skipRows, columnConfigs));
             }
 
             // 保存统计结果到数据库