'commit'

src/main/java/com/dsideal/base/Tools/Excel/Data/SchoolCount.json

@@ -1,4 +1,31 @@
 {
+  "小学": {
+    "schoolName": {
+      "index": 1,
+      "name": "学校名称",
+      "type": "String"
+    },
+    "schoolType": {
+      "index": 3,
+      "name": "学校类型",
+      "type": "String"
+    },
+    "schoolCount": {
+      "index": 5,
+      "name": "学校数量",
+      "type": "Integer"
+    },
+    "city": {
+      "index": 350,
+      "name": "市",
+      "type": "String"
+    },
+    "district": {
+      "index": 351,
+      "name": "区",
+      "type": "String"
+    }
+  },
   "初中": {
     "schoolName": {
       "index": 1,
@@ -25,5 +52,32 @@
       "name": "区",
       "type": "String"
     }
+  },
+  "高中": {
+    "schoolName": {
+      "index": 1,
+      "name": "学校名称",
+      "type": "String"
+    },
+    "schoolType": {
+      "index": 3,
+      "name": "学校类型",
+      "type": "String"
+    },
+    "schoolCount": {
+      "index": 5,
+      "name": "学校数量",
+      "type": "Integer"
+    },
+    "city": {
+      "index": 320,
+      "name": "市",
+      "type": "String"
+    },
+    "district": {
+      "index": 321,
+      "name": "区",
+      "type": "String"
+    }
   }
 }

src/main/java/com/dsideal/base/Tools/Excel/SchoolWithMap.java

@@ -1,7 +1,5 @@
 package com.dsideal.base.Tools.Excel;
 
-import ch.qos.logback.classic.Level;
-import ch.qos.logback.classic.Logger;
 import cn.idev.excel.*;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
@@ -9,11 +7,12 @@ import com.alibaba.fastjson2.JSONObject;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 
+import com.dsideal.base.Tools.Excel.Util.CloseLogUtil;
+import com.dsideal.base.Tools.Excel.Util.ColumnConfig;
 import com.dsideal.base.Tools.Excel.Util.ExcelUtil;
 import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Record;
-import org.slf4j.LoggerFactory;
 
 import java.util.HashMap;
 import java.util.List;
@@ -23,26 +22,7 @@ public class SchoolWithMap {
 
     public static void main(String[] args) throws FileNotFoundException {
         // 一、关闭日志输出
-
-        // 禁用 logback 的状态输出
-        System.setProperty("logback.statusListenerClass", "ch.qos.logback.core.status.NopStatusListener");
-        // 设置所有相关日志级别
-        Logger root = (Logger) LoggerFactory.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME);
-        root.setLevel(Level.ERROR);
-        // 设置特定包的日志级别
-        String[] packages = {
-                "org.ehcache",
-                "org.ehcache.core",
-                "org.ehcache.impl",
-                "org.terracotta",
-                "ch.qos.logback",
-                "org.slf4j"
-        };
-        for (String pkg : packages) {
-            Logger logger = (Logger) LoggerFactory.getLogger(pkg);
-            logger.setLevel(Level.ERROR);
-            logger.setAdditive(false);
-        }
+        CloseLogUtil.Init();
 
         // 二、初始化数据库连接
         LocalMysqlConnectUtil.Init();

src/main/java/com/dsideal/base/Tools/Excel/Util/CloseLogUtil.java

@@ -0,0 +1,29 @@
+package com.dsideal.base.Tools.Excel.Util;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CloseLogUtil {
+    public static void Init(){
+        // 禁用 logback 的状态输出
+        System.setProperty("logback.statusListenerClass", "ch.qos.logback.core.status.NopStatusListener");
+        // 设置所有相关日志级别
+        Logger root = (Logger) LoggerFactory.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME);
+        root.setLevel(Level.ERROR);
+        // 设置特定包的日志级别
+        String[] packages = {
+                "org.ehcache",
+                "org.ehcache.core",
+                "org.ehcache.impl",
+                "org.terracotta",
+                "ch.qos.logback",
+                "org.slf4j"
+        };
+        for (String pkg : packages) {
+            Logger logger = (Logger) LoggerFactory.getLogger(pkg);
+            logger.setLevel(Level.ERROR);
+            logger.setAdditive(false);
+        }
+    }
+}

src/main/java/com/dsideal/base/Tools/Excel/Util/ColumnConfig.java

@@ -1,4 +1,4 @@
-package com.dsideal.base.Tools.Excel;
+package com.dsideal.base.Tools.Excel.Util;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -10,7 +10,7 @@ public class ColumnConfig {
     public String name;    // 列名
     public String type;    // 数据类型
 
-    ColumnConfig(int index, String name, String type) {
+    public ColumnConfig(int index, String name, String type) {
         this.index = index;
         this.name = name;
         this.type = type;

src/main/java/com/dsideal/base/Tools/Excel/Util/ExcelUtil.java

@@ -1,8 +1,6 @@
 package com.dsideal.base.Tools.Excel.Util;
 
 
-import com.dsideal.base.Tools.Excel.ColumnConfig;
-
 import java.util.Map;
 
 public class ExcelUtil {