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 e815593e..1ed7c2a7 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
@@ -1,6 +1,7 @@
 package com.dsideal.base.Tools.FillData.Area;
 
 import cn.hutool.core.io.FileUtil;
+import com.dsideal.base.DataEase.Model.DataEaseModel;
 import com.dsideal.base.Tools.FillData.ExcelKit.ExcelKit;
 import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
 import com.jfinal.kit.StrKit;
@@ -36,11 +37,10 @@ public class A1 {
     //第二个表格的最后一列的列名
     static String tableLetterIndex = "K";
 
+    static DataEaseModel dm=new DataEaseModel();
     public static void main(String[] args) throws IOException, InvalidFormatException {
         //初始化数据库连接
         LocalMysqlConnectUtil.Init();
-        //实例化
-        ReadDocxUtil ru = new ReadDocxUtil();
 
         //结果Excel
         XSSFWorkbook outWorkbook = new XSSFWorkbook();
@@ -80,9 +80,9 @@ public class A1 {
                 //只关心发展规模数据的表格
                 if (!file.getName().contains(fileNameKey)) continue;
                 //县区名称
-                String areaName = ru.getAreaName(file.getName());
+                String areaName = dm.getAreaName(file.getName());
                 //市州名称
-                String cityName = ru.getCityNameByAreaName(areaName);
+                String cityName = dm.getCityNameByAreaName(areaName);
 
                 if (StrKit.isBlank(cityName) || StrKit.isBlank(areaName)) {
                     System.out.println("发现异常数据，请人工处理：" + file.getName());
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A10.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A10.java
index 072b87a0..c4d15ce0 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A10.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A10.java
@@ -1,6 +1,7 @@
 package com.dsideal.base.Tools.FillData.Area;
 
 import cn.hutool.core.io.FileUtil;
+import com.dsideal.base.DataEase.Model.DataEaseModel;
 import com.dsideal.base.Tools.FillData.ExcelKit.ExcelKit;
 import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
 import com.jfinal.kit.StrKit;
@@ -17,7 +18,7 @@ import java.util.Arrays;
 import java.util.List;
 
 public class A10 {
-
+    static DataEaseModel dm = new DataEaseModel();
     //示例Excel
     static String sampleExcelPath = "D:\\dsWork\\YunNanDsBase\\Doc\\待处理\\区\\【10】新-概览\\新-概览.xlsx";
 
@@ -31,7 +32,7 @@ public class A10 {
         //初始化数据库连接
         LocalMysqlConnectUtil.Init();
         //实例化
-        ReadDocxUtil ru = new ReadDocxUtil();
+
 
         //结果Excel
         XSSFWorkbook outWorkbook = new XSSFWorkbook();
@@ -69,7 +70,7 @@ public class A10 {
                 }
                 if (flag) continue;
                 //县区名称
-                String cityName = ru.getCityName(file.getName());
+                String cityName = dm.getCityName(file.getName());
 
                 if (StrKit.isBlank(cityName)) {
                     System.out.println("发现异常数据，请人工处理：" + file.getName());
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A12.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A12.java
index 09d71a5a..d4c6c105 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A12.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A12.java
@@ -1,6 +1,7 @@
 package com.dsideal.base.Tools.FillData.Area;
 
 import cn.hutool.core.io.FileUtil;
+import com.dsideal.base.DataEase.Model.DataEaseModel;
 import com.dsideal.base.Tools.FillData.ExcelKit.ExcelKit;
 import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
 import com.jfinal.kit.StrKit;
@@ -31,12 +32,12 @@ public class A12 {
     //有好多EXCEL，啥样的有用？必须带有关键字字样的才有用!
     static String fileNameKey = "人口变化及其对教育的影响";
 
-
+    static DataEaseModel dm=new DataEaseModel();
     public static void main(String[] args) throws IOException, InvalidFormatException, InterruptedException, DocumentException {
         //初始化数据库连接
         LocalMysqlConnectUtil.Init();
         //实例化
-        ReadDocxUtil ru = new ReadDocxUtil();
+        
 
         //结果Excel
         XSSFWorkbook outWorkbook = new XSSFWorkbook();
@@ -75,9 +76,9 @@ public class A12 {
                 //只关心发展规模数据的表格
                 if (!file.getName().contains(fileNameKey)) continue;
                 //县区名称
-                String areaName = ru.getAreaName(file.getName());
+                String areaName = dm.getAreaName(file.getName());
                 //市州名称
-                String cityName = ru.getCityNameByAreaName(areaName);
+                String cityName = dm.getCityNameByAreaName(areaName);
 
                 if (StrKit.isBlank(cityName) || StrKit.isBlank(areaName)) {
                     System.out.println("发现异常数据，请人工处理：" + file.getName());
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 e2e41fdf..9445847b 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
@@ -1,6 +1,7 @@
 package com.dsideal.base.Tools.FillData.Area;
 
 import cn.hutool.core.io.FileUtil;
+import com.dsideal.base.DataEase.Model.DataEaseModel;
 import com.dsideal.base.Tools.FillData.ExcelKit.ExcelKit;
 import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
 import com.jfinal.kit.StrKit;
@@ -16,7 +17,7 @@ import java.util.Arrays;
 import java.util.List;
 
 public class A2 {
-
+    static DataEaseModel dm = new DataEaseModel();
     //示例Excel
     static String sampleExcelPath = "D:\\dsWork\\YunNanDsBase\\Doc\\待处理\\区\\【2】学前幼儿在园总量预测\\学前幼儿在园总量预测.xlsx";
 
@@ -40,7 +41,7 @@ public class A2 {
         //初始化数据库连接
         LocalMysqlConnectUtil.Init();
         //实例化
-        ReadDocxUtil ru = new ReadDocxUtil();
+
 
         //结果Excel
         XSSFWorkbook outWorkbook = new XSSFWorkbook();
@@ -80,9 +81,9 @@ public class A2 {
                 //只关心发展规模数据的表格
                 if (!file.getName().contains(fileNameKey)) continue;
                 //县区名称
-                String areaName = ru.getAreaName(file.getName());
+                String areaName = dm.getAreaName(file.getName());
                 //市州名称
-                String cityName = ru.getCityNameByAreaName(areaName);
+                String cityName = dm.getCityNameByAreaName(areaName);
 
                 if (StrKit.isBlank(cityName) || StrKit.isBlank(areaName)) {
                     System.out.println("发现异常数据，请人工处理：" + file.getName());
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 98cd9ec9..ee889dfa 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
@@ -1,6 +1,7 @@
 package com.dsideal.base.Tools.FillData.Area;
 
 import cn.hutool.core.io.FileUtil;
+import com.dsideal.base.DataEase.Model.DataEaseModel;
 import com.dsideal.base.Tools.FillData.ExcelKit.ExcelKit;
 import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
 import com.jfinal.kit.StrKit;
@@ -16,7 +17,7 @@ import java.util.Arrays;
 import java.util.List;
 
 public class A3 {
-
+    static DataEaseModel dm = new DataEaseModel();
     //示例Excel
     static String sampleExcelPath = "D:\\dsWork\\YunNanDsBase\\Doc\\待处理\\区\\【3】义务教育招生总量预测\\义务教育招生总量预测.xlsx";
 
@@ -40,7 +41,7 @@ public class A3 {
         //初始化数据库连接
         LocalMysqlConnectUtil.Init();
         //实例化
-        ReadDocxUtil ru = new ReadDocxUtil();
+
 
         //结果Excel
         XSSFWorkbook outWorkbook = new XSSFWorkbook();
@@ -79,10 +80,10 @@ public class A3 {
                 if (flag) continue;
                 //只关心发展规模数据的表格
                 if (!file.getName().contains(fileNameKey)) continue;
-              //县区名称
-                String areaName = ru.getAreaName(file.getName());
+                //县区名称
+                String areaName = dm.getAreaName(file.getName());
                 //市州名称
-                String cityName = ru.getCityNameByAreaName(areaName);
+                String cityName = dm.getCityNameByAreaName(areaName);
 
                 if (StrKit.isBlank(cityName) || StrKit.isBlank(areaName)) {
                     System.out.println("发现异常数据，请人工处理：" + file.getName());
@@ -120,7 +121,7 @@ public class A3 {
                             v = Integer.parseInt(stringList.get(ExcelKit.transLetter2Num("D")).split("\\.")[0]);
                         }
                         Row outRow = outSheet.createRow(++rowIndex);
-                        ExcelKit.putData(outRow, Arrays.asList(String.valueOf(year),"", "总招生数",stageName,"", String.valueOf(v),  areaName, cityName), dataStyle);
+                        ExcelKit.putData(outRow, Arrays.asList(String.valueOf(year), "", "总招生数", stageName, "", String.valueOf(v), areaName, cityName), dataStyle);
                     }
 
                     //2022入园基数
@@ -135,7 +136,7 @@ public class A3 {
                             v = Integer.parseInt(dataList.getFirst().get(ExcelKit.transLetter2Num("D")).split("\\.")[0]);
                         }
                         Row outRow = outSheet.createRow(++rowIndex);
-                        ExcelKit.putData(outRow, Arrays.asList(String.valueOf(year),"", "2022年基数",stageName, "", String.valueOf(v),  areaName, cityName), dataStyle);
+                        ExcelKit.putData(outRow, Arrays.asList(String.valueOf(year), "", "2022年基数", stageName, "", String.valueOf(v), areaName, cityName), dataStyle);
                     }
 
                     //城区
@@ -151,7 +152,7 @@ public class A3 {
                         }
                         Row outRow = outSheet.createRow(++rowIndex);
                         ExcelKit.putData(outRow, Arrays.asList(String.valueOf(year),
-                                "城区", "",stageName, String.valueOf(v),"", areaName, cityName), dataStyle);
+                                "城区", "", stageName, String.valueOf(v), "", areaName, cityName), dataStyle);
                     }
 
                     //预测镇区在校生数 修正县城外在校生数*30%
@@ -166,7 +167,7 @@ public class A3 {
                             v = (int) (v * 0.3);//乘以0.3
                         }
                         Row outRow = outSheet.createRow(++rowIndex);
-                        ExcelKit.putData(outRow, Arrays.asList(String.valueOf(year),  "镇区", "",stageName, String.valueOf(v),"", areaName, cityName), dataStyle);
+                        ExcelKit.putData(outRow, Arrays.asList(String.valueOf(year), "镇区", "", stageName, String.valueOf(v), "", areaName, cityName), dataStyle);
                     }
 
                     for (List<String> stringList : dataList) {
@@ -181,7 +182,7 @@ public class A3 {
                             v = v - d;//剩下70%
                         }
                         Row outRow = outSheet.createRow(++rowIndex);
-                        ExcelKit.putData(outRow, Arrays.asList(String.valueOf(year),  "乡村", "",stageName, String.valueOf(v),"", areaName, cityName), dataStyle);
+                        ExcelKit.putData(outRow, Arrays.asList(String.valueOf(year), "乡村", "", stageName, String.valueOf(v), "", areaName, cityName), dataStyle);
                     }
                 }
             }
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 349b14d3..a605f8c8 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
@@ -1,6 +1,7 @@
 package com.dsideal.base.Tools.FillData.Area;
 
 import cn.hutool.core.io.FileUtil;
+import com.dsideal.base.DataEase.Model.DataEaseModel;
 import com.dsideal.base.Tools.FillData.ExcelKit.ExcelKit;
 import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
 import com.jfinal.kit.StrKit;
@@ -40,7 +41,7 @@ public class A4 {
         //初始化数据库连接
         LocalMysqlConnectUtil.Init();
         //实例化
-        ReadDocxUtil ru = new ReadDocxUtil();
+
 
         //结果Excel
         XSSFWorkbook outWorkbook = new XSSFWorkbook();
@@ -79,10 +80,11 @@ public class A4 {
                 if (flag) continue;
                 //只关心发展规模数据的表格
                 if (!file.getName().contains(fileNameKey)) continue;
-             //县区名称
-                String areaName = ru.getAreaName(file.getName());
+                //县区名称
+                DataEaseModel dm = new DataEaseModel();
+                String areaName = dm.getAreaName(file.getName());
                 //市州名称
-                String cityName = ru.getCityNameByAreaName(areaName);
+                String cityName = dm.getCityNameByAreaName(areaName);
 
                 if (StrKit.isBlank(cityName) || StrKit.isBlank(areaName)) {
                     System.out.println("发现异常数据，请人工处理：" + file.getName());
@@ -120,7 +122,7 @@ public class A4 {
                             v = Integer.parseInt(stringList.get(ExcelKit.transLetter2Num("G")).split("\\.")[0]);
                         }
                         Row outRow = outSheet.createRow(++rowIndex);
-                        ExcelKit.putData(outRow, Arrays.asList(String.valueOf(year),"", "总招生数",stageName,"", String.valueOf(v),  areaName, cityName), dataStyle);
+                        ExcelKit.putData(outRow, Arrays.asList(String.valueOf(year), "", "总招生数", stageName, "", String.valueOf(v), areaName, cityName), dataStyle);
                     }
 
                     //2022入园基数
@@ -135,7 +137,7 @@ public class A4 {
                             v = Integer.parseInt(dataList.getFirst().get(ExcelKit.transLetter2Num("G")).split("\\.")[0]);
                         }
                         Row outRow = outSheet.createRow(++rowIndex);
-                        ExcelKit.putData(outRow, Arrays.asList(String.valueOf(year),"", "2022年基数",stageName, "", String.valueOf(v),  areaName, cityName), dataStyle);
+                        ExcelKit.putData(outRow, Arrays.asList(String.valueOf(year), "", "2022年基数", stageName, "", String.valueOf(v), areaName, cityName), dataStyle);
                     }
 
                     //城区
@@ -151,7 +153,7 @@ public class A4 {
                         }
                         Row outRow = outSheet.createRow(++rowIndex);
                         ExcelKit.putData(outRow, Arrays.asList(String.valueOf(year),
-                                "城区", "",stageName, String.valueOf(v),"", areaName, cityName), dataStyle);
+                                "城区", "", stageName, String.valueOf(v), "", areaName, cityName), dataStyle);
                     }
 
                     //预测镇区在校生数 修正县城外在校生数*30%
@@ -166,7 +168,7 @@ public class A4 {
                             v = (int) (v * 0.3);//乘以0.3
                         }
                         Row outRow = outSheet.createRow(++rowIndex);
-                        ExcelKit.putData(outRow, Arrays.asList(String.valueOf(year),  "镇区", "",stageName, String.valueOf(v),"", areaName, cityName), dataStyle);
+                        ExcelKit.putData(outRow, Arrays.asList(String.valueOf(year), "镇区", "", stageName, String.valueOf(v), "", areaName, cityName), dataStyle);
                     }
 
                     for (List<String> stringList : dataList) {
@@ -181,7 +183,7 @@ public class A4 {
                             v = v - d;//剩下70%
                         }
                         Row outRow = outSheet.createRow(++rowIndex);
-                        ExcelKit.putData(outRow, Arrays.asList(String.valueOf(year),  "乡村", "",stageName, String.valueOf(v),"", areaName, cityName), dataStyle);
+                        ExcelKit.putData(outRow, Arrays.asList(String.valueOf(year), "乡村", "", stageName, String.valueOf(v), "", areaName, cityName), dataStyle);
                     }
                 }
             }
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 104ca8b5..8070b419 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
@@ -1,6 +1,7 @@
 package com.dsideal.base.Tools.FillData.Area;
 
 import cn.hutool.core.io.FileUtil;
+import com.dsideal.base.DataEase.Model.DataEaseModel;
 import com.dsideal.base.Tools.FillData.ExcelKit.ExcelKit;
 import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
 import com.jfinal.kit.StrKit;
@@ -40,7 +41,7 @@ public class A5 {
         //初始化数据库连接
         LocalMysqlConnectUtil.Init();
         //实例化
-        ReadDocxUtil ru = new ReadDocxUtil();
+
 
         //结果Excel
         XSSFWorkbook outWorkbook = new XSSFWorkbook();
@@ -79,10 +80,11 @@ public class A5 {
                 if (flag) continue;
                 //只关心发展规模数据的表格
                 if (!file.getName().contains(fileNameKey)) continue;
-             //县区名称
-                String areaName = ru.getAreaName(file.getName());
+                //县区名称
+                DataEaseModel dm = new DataEaseModel();
+                String areaName = dm.getAreaName(file.getName());
                 //市州名称
-                String cityName = ru.getCityNameByAreaName(areaName);
+                String cityName = dm.getCityNameByAreaName(areaName);
 
                 if (StrKit.isBlank(cityName) || StrKit.isBlank(areaName)) {
                     System.out.println("发现异常数据，请人工处理：" + file.getName());
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 e0db8c01..716fdbe8 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
@@ -1,6 +1,7 @@
 package com.dsideal.base.Tools.FillData.Area;
 
 import cn.hutool.core.io.FileUtil;
+import com.dsideal.base.DataEase.Model.DataEaseModel;
 import com.dsideal.base.Tools.FillData.ExcelKit.ExcelKit;
 import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
 import com.jfinal.kit.StrKit;
@@ -40,7 +41,7 @@ public class A6 {
         //初始化数据库连接
         LocalMysqlConnectUtil.Init();
         //实例化
-        ReadDocxUtil ru = new ReadDocxUtil();
+
 
         //结果Excel
         XSSFWorkbook outWorkbook = new XSSFWorkbook();
@@ -79,10 +80,11 @@ public class A6 {
                 if (flag) continue;
                 //只关心发展规模数据的表格
                 if (!file.getName().contains(fileNameKey)) continue;
-              //县区名称
-                String areaName = ru.getAreaName(file.getName());
+                //县区名称
+                DataEaseModel dm = new DataEaseModel();
+                String areaName = dm.getAreaName(file.getName());
                 //市州名称
-                String cityName = ru.getCityNameByAreaName(areaName);
+                String cityName = dm.getCityNameByAreaName(areaName);
 
                 if (StrKit.isBlank(cityName) || StrKit.isBlank(areaName)) {
                     System.out.println("发现异常数据，请人工处理：" + file.getName());
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A7.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A7.java
index db2f0265..6e1e1970 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A7.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A7.java
@@ -1,6 +1,7 @@
 package com.dsideal.base.Tools.FillData.Area;
 
 import cn.hutool.core.io.FileUtil;
+import com.dsideal.base.DataEase.Model.DataEaseModel;
 import com.dsideal.base.Tools.FillData.ExcelKit.ExcelKit;
 import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
 import com.jfinal.kit.StrKit;
@@ -40,7 +41,7 @@ public class A7 {
         //初始化数据库连接
         LocalMysqlConnectUtil.Init();
         //实例化
-        ReadDocxUtil ru = new ReadDocxUtil();
+
 
         //结果Excel
         XSSFWorkbook outWorkbook = new XSSFWorkbook();
@@ -80,9 +81,10 @@ public class A7 {
                 //只关心发展规模数据的表格
                 if (!file.getName().contains(fileNameKey)) continue;
                 //县区名称
-                String areaName = ru.getAreaName(file.getName());
+                DataEaseModel dm = new DataEaseModel();
+                String areaName = dm.getAreaName(file.getName());
                 //市州名称
-                String cityName = ru.getCityNameByAreaName(areaName);
+                String cityName = dm.getCityNameByAreaName(areaName);
 
                 if (StrKit.isBlank(cityName) || StrKit.isBlank(areaName)) {
                     System.out.println("发现异常数据，请人工处理：" + file.getName());
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 cd057f03..94670d69 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
@@ -1,6 +1,7 @@
 package com.dsideal.base.Tools.FillData.Area;
 
 import cn.hutool.core.io.FileUtil;
+import com.dsideal.base.DataEase.Model.DataEaseModel;
 import com.dsideal.base.Tools.FillData.ExcelKit.ExcelKit;
 import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
 import com.jfinal.kit.StrKit;
@@ -35,7 +36,7 @@ public class A8 {
         //初始化数据库连接
         LocalMysqlConnectUtil.Init();
         //实例化
-        ReadDocxUtil ru = new ReadDocxUtil();
+
 
         //结果Excel
         XSSFWorkbook outWorkbook = new XSSFWorkbook();
@@ -75,9 +76,10 @@ public class A8 {
                 //只关心发展规模数据的表格
                 if (!file.getName().contains(fileNameKey)) continue;
                 //县区名称
-                String areaName = ru.getAreaName(file.getName());
+                DataEaseModel dm = new DataEaseModel();
+                String areaName = dm.getAreaName(file.getName());
                 //市州名称
-                String cityName = ru.getCityNameByAreaName(areaName);
+                String cityName = dm.getCityNameByAreaName(areaName);
 
                 if (StrKit.isBlank(cityName) || StrKit.isBlank(areaName)) {
                     System.out.println("发现异常数据，请人工处理：" + file.getName());
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 435fafa0..74eb73f8 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
@@ -1,6 +1,7 @@
 package com.dsideal.base.Tools.FillData.Area;
 
 import cn.hutool.core.io.FileUtil;
+import com.dsideal.base.DataEase.Model.DataEaseModel;
 import com.dsideal.base.Tools.FillData.ExcelKit.ExcelKit;
 import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
 import com.jfinal.kit.StrKit;
@@ -35,7 +36,7 @@ public class A9 {
         //初始化数据库连接
         LocalMysqlConnectUtil.Init();
         //实例化
-        ReadDocxUtil ru = new ReadDocxUtil();
+
 
         //结果Excel
         XSSFWorkbook outWorkbook = new XSSFWorkbook();
@@ -75,9 +76,10 @@ public class A9 {
                 //只关心发展规模数据的表格
                 if (!file.getName().contains(fileNameKey)) continue;
                 //县区名称
-                String areaName = ru.getAreaName(file.getName());
+                DataEaseModel dm = new DataEaseModel();
+                String areaName = dm.getAreaName(file.getName());
                 //市州名称
-                String cityName = ru.getCityNameByAreaName(areaName);
+                String cityName = dm.getCityNameByAreaName(areaName);
 
                 if (StrKit.isBlank(cityName) || StrKit.isBlank(areaName)) {
                     System.out.println("发现异常数据，请人工处理：" + file.getName());
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C1.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C1.java
index cc2b87ab..a92f0fbf 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/City/C1.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C1.java
@@ -1,6 +1,7 @@
 package com.dsideal.base.Tools.FillData.City;
 
 import cn.hutool.core.io.FileUtil;
+import com.dsideal.base.DataEase.Model.DataEaseModel;
 import com.dsideal.base.Tools.FillData.ExcelKit.ExcelKit;
 import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
@@ -27,7 +28,7 @@ public class C1 {
         //初始化数据库连接
         LocalMysqlConnectUtil.Init();
         //实例化
-        ReadDocxUtil ru = new ReadDocxUtil();
+        
 
         //目标Excel,就是把文件名解析出来后，后面添加上【成果】,需要动态计算获取，不能写死
         String excelPath = sampleExcelPath.replace(".xlsx", "【成果】.xlsx");
@@ -53,7 +54,8 @@ public class C1 {
                 //判断file是不是目录，是目录的需要跳过
                 if (file.isDirectory()) continue;
                 //城市名称
-                String cityName = ru.getCityName(file.getName());
+                DataEaseModel dm=new DataEaseModel();
+                String cityName = dm.getCityName(file.getName());
                 String fileName = file.getName();
 
                 //判断是否为docx文件
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C10.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C10.java
index 3590dfdd..f5800e10 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/City/C10.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C10.java
@@ -1,6 +1,7 @@
 package com.dsideal.base.Tools.FillData.City;
 
 import cn.hutool.core.io.FileUtil;
+import com.dsideal.base.DataEase.Model.DataEaseModel;
 import com.dsideal.base.Tools.FillData.ExcelKit.ExcelKit;
 import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
 import com.jfinal.kit.StrKit;
@@ -28,7 +29,7 @@ public class C10 {
         //初始化数据库连接
         LocalMysqlConnectUtil.Init();
         //实例化
-        ReadDocxUtil ru = new ReadDocxUtil();
+        
 
         //目标Excel,就是把文件名解析出来后，后面添加上【成果】,需要动态计算获取，不能写死
         String excelPath = sampleExcelPath.replace(".xlsx", "【成果】.xlsx");
@@ -54,7 +55,8 @@ public class C10 {
                 //判断file是不是目录，是目录的需要跳过
                 if (file.isDirectory()) continue;
                 //城市名称
-                String cityName = ru.getCityName(file.getName());
+                DataEaseModel dm=new DataEaseModel();
+                String cityName = dm.getCityName(file.getName());
                 String fileName = file.getName();
 
                 //判断是否为docx文件
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C11.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C11.java
index 2651e337..1e92edb2 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/City/C11.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C11.java
@@ -1,6 +1,7 @@
 package com.dsideal.base.Tools.FillData.City;
 
 import cn.hutool.core.io.FileUtil;
+import com.dsideal.base.DataEase.Model.DataEaseModel;
 import com.dsideal.base.Tools.FillData.ExcelKit.ExcelKit;
 import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
@@ -27,7 +28,7 @@ public class C11 {
         //初始化数据库连接
         LocalMysqlConnectUtil.Init();
         //实例化
-        ReadDocxUtil ru = new ReadDocxUtil();
+
 
         //目标Excel,就是把文件名解析出来后，后面添加上【成果】,需要动态计算获取，不能写死
         String excelPath = sampleExcelPath.replace(".xlsx", "【成果】.xlsx");
@@ -53,7 +54,8 @@ public class C11 {
                 //判断file是不是目录，是目录的需要跳过
                 if (file.isDirectory()) continue;
                 //城市名称
-                String cityName = ru.getCityName(file.getName());
+                DataEaseModel dm = new DataEaseModel();
+                String cityName = dm.getCityName(file.getName());
                 String fileName = file.getName();
 
                 //判断是否为docx文件
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C2.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C2.java
index 51936338..11298bd4 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/City/C2.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C2.java
@@ -1,6 +1,7 @@
 package com.dsideal.base.Tools.FillData.City;
 
 import cn.hutool.core.io.FileUtil;
+import com.dsideal.base.DataEase.Model.DataEaseModel;
 import com.dsideal.base.Tools.FillData.ExcelKit.ExcelKit;
 import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
 import com.jfinal.kit.StrKit;
@@ -28,7 +29,7 @@ public class C2 {
         //初始化数据库连接
         LocalMysqlConnectUtil.Init();
         //实例化
-        ReadDocxUtil ru = new ReadDocxUtil();
+        
 
         //目标Excel,就是把文件名解析出来后，后面添加上【成果】,需要动态计算获取，不能写死
         String excelPath = sampleExcelPath.replace(".xlsx", "【成果】.xlsx");
@@ -54,7 +55,8 @@ public class C2 {
                 //判断file是不是目录，是目录的需要跳过
                 if (file.isDirectory()) continue;
                 //城市名称
-                String cityName = ru.getCityName(file.getName());
+                DataEaseModel dm=new DataEaseModel();
+                String cityName = dm.getCityName(file.getName());
                 String fileName = file.getName();
 
                 //判断是否为docx文件
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C3.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C3.java
index d9e11919..84f25b8a 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/City/C3.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C3.java
@@ -1,6 +1,7 @@
 package com.dsideal.base.Tools.FillData.City;
 
 import cn.hutool.core.io.FileUtil;
+import com.dsideal.base.DataEase.Model.DataEaseModel;
 import com.dsideal.base.Tools.FillData.ExcelKit.ExcelKit;
 import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
 import lombok.Getter;
@@ -37,7 +38,7 @@ public class C3 {
         //初始化数据库连接
         LocalMysqlConnectUtil.Init();
         //实例化
-        ReadDocxUtil ru = new ReadDocxUtil();
+        
 
         //目标Excel,就是把文件名解析出来后，后面添加上【成果】,需要动态计算获取，不能写死
         String excelPath = sampleExcelPath.replace(".xlsx", "【成果】.xlsx");
@@ -63,7 +64,8 @@ public class C3 {
                 //判断file是不是目录，是目录的需要跳过
                 if (file.isDirectory()) continue;
                 //城市名称
-                String cityName = ru.getCityName(file.getName());
+                DataEaseModel dm=new DataEaseModel();
+                String cityName = dm.getCityName(file.getName());
                 String fileName = file.getName();
 
                 //判断是否为docx文件
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C4.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C4.java
index 70ffb486..549f58a5 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/City/C4.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C4.java
@@ -1,6 +1,7 @@
 package com.dsideal.base.Tools.FillData.City;
 
 import cn.hutool.core.io.FileUtil;
+import com.dsideal.base.DataEase.Model.DataEaseModel;
 import com.dsideal.base.Tools.FillData.ExcelKit.ExcelKit;
 import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
 import lombok.Getter;
@@ -37,7 +38,7 @@ public class C4 {
         //初始化数据库连接
         LocalMysqlConnectUtil.Init();
         //实例化
-        ReadDocxUtil ru = new ReadDocxUtil();
+        
 
         //目标Excel,就是把文件名解析出来后，后面添加上【成果】,需要动态计算获取，不能写死
         String excelPath = sampleExcelPath.replace(".xlsx", "【成果】.xlsx");
@@ -63,7 +64,8 @@ public class C4 {
                 //判断file是不是目录，是目录的需要跳过
                 if (file.isDirectory()) continue;
                 //城市名称
-                String cityName = ru.getCityName(file.getName());
+                DataEaseModel dm=new DataEaseModel();
+                String cityName = dm.getCityName(file.getName());
                 String fileName = file.getName();
 
                 //判断是否为docx文件
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C5.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C5.java
index 762169c3..500c1204 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/City/C5.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C5.java
@@ -1,6 +1,7 @@
 package com.dsideal.base.Tools.FillData.City;
 
 import cn.hutool.core.io.FileUtil;
+import com.dsideal.base.DataEase.Model.DataEaseModel;
 import com.dsideal.base.Tools.FillData.ExcelKit.ExcelKit;
 import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
@@ -27,7 +28,7 @@ public class C5 {
         //初始化数据库连接
         LocalMysqlConnectUtil.Init();
         //实例化
-        ReadDocxUtil ru = new ReadDocxUtil();
+        
 
         //目标Excel,就是把文件名解析出来后，后面添加上【成果】,需要动态计算获取，不能写死
         String excelPath = sampleExcelPath.replace(".xlsx", "【成果】.xlsx");
@@ -53,7 +54,8 @@ public class C5 {
                 //判断file是不是目录，是目录的需要跳过
                 if (file.isDirectory()) continue;
                 //城市名称
-                String cityName = ru.getCityName(file.getName());
+                DataEaseModel dm=new DataEaseModel();
+                String cityName = dm.getCityName(file.getName());
                 String fileName = file.getName();
 
                 //判断是否为docx文件
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C6.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C6.java
index 41babc43..8f94e60f 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/City/C6.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C6.java
@@ -1,6 +1,7 @@
 package com.dsideal.base.Tools.FillData.City;
 
 import cn.hutool.core.io.FileUtil;
+import com.dsideal.base.DataEase.Model.DataEaseModel;
 import com.dsideal.base.Tools.FillData.ExcelKit.ExcelKit;
 import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
@@ -27,7 +28,7 @@ public class C6 {
         //初始化数据库连接
         LocalMysqlConnectUtil.Init();
         //实例化
-        ReadDocxUtil ru = new ReadDocxUtil();
+        
 
         //目标Excel,就是把文件名解析出来后，后面添加上【成果】,需要动态计算获取，不能写死
         String excelPath = sampleExcelPath.replace(".xlsx", "【成果】.xlsx");
@@ -53,7 +54,8 @@ public class C6 {
                 //判断file是不是目录，是目录的需要跳过
                 if (file.isDirectory()) continue;
                 //城市名称
-                String cityName = ru.getCityName(file.getName());
+                DataEaseModel dm=new DataEaseModel();
+                String cityName = dm.getCityName(file.getName());
                 String fileName = file.getName();
 
                 //判断是否为docx文件
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C7.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C7.java
index 38731a32..c192c87a 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/City/C7.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C7.java
@@ -1,6 +1,7 @@
 package com.dsideal.base.Tools.FillData.City;
 
 import cn.hutool.core.io.FileUtil;
+import com.dsideal.base.DataEase.Model.DataEaseModel;
 import com.dsideal.base.Tools.FillData.ExcelKit.ExcelKit;
 import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
 import com.jfinal.kit.StrKit;
@@ -26,7 +27,7 @@ public class C7 {
         //初始化数据库连接
         LocalMysqlConnectUtil.Init();
         //实例化
-        ReadDocxUtil ru = new ReadDocxUtil();
+        
 
         //结果Excel
         XSSFWorkbook outWorkbook = new XSSFWorkbook();
@@ -126,7 +127,8 @@ public class C7 {
                 //判断file是不是目录，是目录的需要跳过
                 if (file.isDirectory()) continue;
                 //城市名称
-                String cityName = ru.getCityName(file.getName());
+                DataEaseModel dm=new DataEaseModel();
+                String cityName = dm.getCityName(file.getName());
                 if (StrKit.isBlank(cityName)) {
                     System.out.println("发现异常数据，请人工处理：" + file.getName());
                     System.exit(0);
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C8.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C8.java
index de82e063..d5ae77ad 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/City/C8.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C8.java
@@ -1,6 +1,7 @@
 package com.dsideal.base.Tools.FillData.City;
 
 import cn.hutool.core.io.FileUtil;
+import com.dsideal.base.DataEase.Model.DataEaseModel;
 import com.dsideal.base.Tools.FillData.ExcelKit.ExcelKit;
 import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
 import com.jfinal.kit.StrKit;
@@ -27,7 +28,7 @@ public class C8 {
         //初始化数据库连接
         LocalMysqlConnectUtil.Init();
         //实例化
-        ReadDocxUtil ru = new ReadDocxUtil();
+        
 
         //结果Excel
         XSSFWorkbook outWorkbook = new XSSFWorkbook();
@@ -55,7 +56,8 @@ public class C8 {
                 //判断file是不是目录，是目录的需要跳过
                 if (file.isDirectory()) continue;
                 //城市名称
-                String cityName = ru.getCityName(file.getName());
+                DataEaseModel dm=new DataEaseModel();
+                String cityName = dm.getCityName(file.getName());
                 if (StrKit.isBlank(cityName)) {
                     System.out.println("发现异常数据，请人工处理：" + file.getName());
                     System.exit(0);
diff --git a/src/main/java/com/dsideal/base/Tools/FillData/City/C9.java b/src/main/java/com/dsideal/base/Tools/FillData/City/C9.java
index 59fd0b50..61504807 100644
--- a/src/main/java/com/dsideal/base/Tools/FillData/City/C9.java
+++ b/src/main/java/com/dsideal/base/Tools/FillData/City/C9.java
@@ -1,6 +1,7 @@
 package com.dsideal.base.Tools.FillData.City;
 
 import cn.hutool.core.io.FileUtil;
+import com.dsideal.base.DataEase.Model.DataEaseModel;
 import com.dsideal.base.Tools.FillData.ExcelKit.ExcelKit;
 import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
 import com.jfinal.kit.StrKit;
@@ -29,7 +30,7 @@ public class C9 {
         //初始化数据库连接
         LocalMysqlConnectUtil.Init();
         //实例化
-        ReadDocxUtil ru = new ReadDocxUtil();
+        
 
         //目标Excel,就是把文件名解析出来后，后面添加上【成果】,需要动态计算获取，不能写死
         String excelPath = sampleExcelPath.replace(".xlsx", "【成果】.xlsx");
@@ -60,7 +61,8 @@ public class C9 {
                 //判断是否为docx文件
                 if (fileName.endsWith(".docx") && !fileName.startsWith("~")) {
                     //城市名称
-                    String cityName = ru.getCityName(file.getName());
+                    DataEaseModel dm=new DataEaseModel();
+                    String cityName = dm.getCityName(file.getName());
                     if (StrKit.isBlank(cityName)) {
                         System.out.println("文件名无法解析为城市：" + fileName);
                         System.exit(0);
diff --git a/src/main/java/com/dsideal/base/Tools/Test/TestBadExcel.java b/src/main/java/com/dsideal/base/Tools/Test/TestBadExcel.java
index 4b36ea57..becdaa67 100644
--- a/src/main/java/com/dsideal/base/Tools/Test/TestBadExcel.java
+++ b/src/main/java/com/dsideal/base/Tools/Test/TestBadExcel.java
@@ -1,6 +1,7 @@
 package com.dsideal.base.Tools.Test;
 
 import cn.hutool.core.io.FileUtil;
+import com.dsideal.base.DataEase.Model.DataEaseModel;
 import com.dsideal.base.Tools.FillData.ExcelKit.ExcelKit;
 import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
@@ -25,7 +26,7 @@ public class TestBadExcel {
         //初始化数据库连接
         LocalMysqlConnectUtil.Init();
         //实例化
-        ReadDocxUtil ru = new ReadDocxUtil();
+        
 
 
         //找到parentPath下一级目录中所有文件
@@ -37,7 +38,8 @@ public class TestBadExcel {
                 //判断file是不是目录，是目录的需要跳过
                 if (file.isDirectory()) continue;
                 //城市名称
-                String cityName = ru.getCityName(file.getName());
+                DataEaseModel dm=new DataEaseModel();
+                String cityName = dm.getCityName(file.getName());
                 String fileName = file.getName();
 
                 //判断是否为docx文件
diff --git a/src/main/java/com/dsideal/base/Tools/Test/TestCityArea.java b/src/main/java/com/dsideal/base/Tools/Test/TestCityArea.java
index e28cec92..801678ca 100644
--- a/src/main/java/com/dsideal/base/Tools/Test/TestCityArea.java
+++ b/src/main/java/com/dsideal/base/Tools/Test/TestCityArea.java
@@ -1,5 +1,6 @@
 package com.dsideal.base.Tools.Test;
 
+import com.dsideal.base.DataEase.Model.DataEaseModel;
 import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Record;
@@ -10,8 +11,8 @@ public class TestCityArea {
     public static void main(String[] args) throws Exception {
         LocalMysqlConnectUtil.Init();
         //实例化
-        ReadDocxUtil ru = new ReadDocxUtil();
-        List<String> list = ru.getCityNameList();
+        DataEaseModel dm=new DataEaseModel();
+        List<String> list = dm.getCityNameList();
         for (String s : list) {
             String sql = "select id from t_dm_area where area_name=?";
             String area_id = Db.queryStr(sql, s);