'commit'

src/main/java/com/dsideal/base/Tools/FillData/Area/A12.java

@@ -29,9 +29,6 @@ public class A12 {
     //哪些是处理不了的，就不处理了~
     static String[] excludeCityList = {"~$", "磨憨-磨丁", "经开区", "阳宗海"};
 
-    //有好多EXCEL，啥样的有用？必须带有关键字字样的才有用!
-    static String fileNameKey = "人口变化及其对教育的影响";
-
     static DataEaseModel dm=new DataEaseModel();
     public static void main(String[] args) throws IOException, InvalidFormatException, InterruptedException, DocumentException {
         //初始化数据库连接
@@ -70,8 +67,6 @@ public class A12 {
                     }
                 }
                 if (flag) continue;
-                //只关心发展规模数据的表格
-                if (!file.getName().contains(fileNameKey)) continue;
                 //县区名称
                 String areaName = dm.getAreaName(file.getName());
                 //市州名称

src/main/java/com/dsideal/base/Tools/FillData/Area/A9.java

@@ -28,9 +28,6 @@ public class A9 {
     //哪些是处理不了的，就不处理了~
     static String[] excludeCityList = {"~$", "磨憨-磨丁", "经开区", "阳宗海"};
 
-    //有好多EXCEL，啥样的有用？必须带有关键字字样的才有用!
-    static String fileNameKey = "人口变化";
-
 
     public static void main(String[] args) throws IOException, InvalidFormatException, InterruptedException, DocumentException {
         //初始化数据库连接
@@ -71,8 +68,6 @@ public class A9 {
                     }
                 }
                 if (flag) continue;
-                //只关心发展规模数据的表格
-                if (!file.getName().contains(fileNameKey)) continue;
                 //县区名称
                 DataEaseModel dm = new DataEaseModel();
                 String areaName = dm.getAreaName(file.getName());

src/main/java/com/dsideal/base/Tools/FillData/DataEaseKit/DsKit.java

@@ -592,6 +592,7 @@ public class DsKit {
                     Element ser = ce.elements("ser").get(i);
                     //cat 标签
                     Element cat = ser.element("cat");
+                    if(cat==null) return tList;
                     Element numRef = cat.element("numRef");
                     if (numRef == null) numRef = cat.element("strRef");//这玩意有时是strRef，有时是numRef，Shit~
                     //数据