'commit'

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

@@ -29,7 +29,7 @@ public class A8 {
     static String[] excludeCityList = {"~$", "磨憨-磨丁", "经开区", "阳宗海"};
 
     //有好多EXCEL，啥样的有用？必须带有关键字字样的才有用!
-    static String fileNameKey = "人口变化及其对教育的影响";
+    static String fileNameKey = "人口变化";
 
 
     public static void main(String[] args) throws IOException, InvalidFormatException, InterruptedException, DocumentException {

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

@@ -29,7 +29,7 @@ public class A9 {
     static String[] excludeCityList = {"~$", "磨憨-磨丁", "经开区", "阳宗海"};
 
     //有好多EXCEL，啥样的有用？必须带有关键字字样的才有用!
-    static String fileNameKey = "人口变化及其对教育的影响";
+    static String fileNameKey = "人口变化";
 
 
     public static void main(String[] args) throws IOException, InvalidFormatException, InterruptedException, DocumentException {

src/main/java/com/dsideal/base/Tools/FillData/ExcelKit/ExcelKit.java

@@ -580,13 +580,17 @@ public class ExcelKit {
                 String type = child.getName();
                 //ce:chart element
                 Element ce = root.element("chart").element("plotArea").element(type);
+
                 for (int i = 0; i < ce.elements("ser").size(); i++) {
                     Element ser = ce.elements("ser").get(i);
                     //cat 标签
                     Element cat = ser.element("cat");
                     Element numRef = cat.element("numRef");
+                    if (numRef == null) numRef = cat.element("strRef");//这玩意有时是strRef，有时是numRef，Shit~
                     //数据
                     Element numCache = numRef.element("numCache");
+                    if (numCache == null) numCache = numRef.element("strCache");
+
                     //多个数据组，xList(横坐标年份数据)一定是一样的，并且它是最全的,只读取一次即可
                     if (!hadReadXList) {
                         List<Element> xList = numCache.elements("pt");

src/main/java/com/dsideal/base/Tools/Test/TestOutSideExcel.java

@@ -13,11 +13,11 @@ import java.util.List;
 public class TestOutSideExcel {
 
     public static void main(String[] args) throws IOException, InvalidFormatException, InterruptedException, ParserConfigurationException, SAXException, XPathExpressionException, DocumentException {
-        String sourceDoc = "c:/《富宁县人口变化趋势对基础教育的影响》（已审核）.docx";
+        String sourceDoc = "c:/嵩明县人口变化趋势对基础教育的影响.docx";
 
         ExcelKit.UnCompress(sourceDoc);
         //需要第几个图表
-        for (int chartNumber = 1; chartNumber <= 20; chartNumber++) {
+        for (int chartNumber = 1; chartNumber <= 1; chartNumber++) {
             System.out.println("正在处理第" + chartNumber + "个图表的信息~");
             //读取图表
             List<List<String>> list = ExcelKit.getChartData(sourceDoc, chartNumber, 0);