'commit'

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

@@ -54,7 +54,6 @@ public class A12 {
 
         //找到parentPath下一级目录中所有文件
         List<File> files = FileUtil.loopFiles(parentPath, file -> true);
-        int rowIndex = 0;
 
         //处理这个目录
         if (files != null) {
@@ -85,12 +84,10 @@ public class A12 {
                 //县区名称
                 System.out.println("正在进行" + cityName + "-" + areaName + "的数据填充~");
                 int chartNumber = 36;
-                List<List<String>> source36 =
+                List<List<String>> source36 = ExcelKit.getChartData(file.getAbsolutePath(), chartNumber , 6);//从2017年开始
-                        ExcelKit.getChartData(file.getAbsolutePath(), chartNumber - 1, 6);//从2017年开始
 
                 chartNumber = 37;
-                List<List<String>> source37 =
+                List<List<String>> source37 = ExcelKit.getChartData(file.getAbsolutePath(), chartNumber, 6);//从2017年开始
-                        ExcelKit.getChartData(file.getAbsolutePath(), chartNumber - 1, 6);//从2017年开始
 
             }
         }

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

@@ -545,6 +545,7 @@ public class ExcelKit {
         //将xml用IDEA打开，搜索关键的数据值，然后右键查看XPATH完整路径可以获取到下面的路径
         ///c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:cat/c:numRef/c:numCache/c:pt/c:v
 
+        ///c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:val/c:numRef/c:numCache/c:pt/c:v
         //在每个已知的图表类型中查找，找到后跳出循环
         //声明一个数组,图表的所有类型
         String[] CHART_TYPES = {"lineChart", "barChart"};//折线，柱状
@@ -559,10 +560,11 @@ public class ExcelKit {
             if (CHART_TYPES_LIST.contains(child.getName())) {
                 transposed.clear();
                 // 处理barChart或lineChart节点
-                System.out.println("找到图表类型：" + child.getName());
+                //System.out.println("找到图表类型：" + child.getName());
                 String type = child.getName();
-                xList = root.element("chart").element("plotArea").element(type).element("ser").element("cat")
+                Element q = root.element("chart").element("plotArea").element(type)
-                        .element("numRef").element("numCache").elements("pt");
+                        .element("ser").element("cat").element("numRef");
+                xList = q.element("numCache").elements("pt");
 
                 List<Object> listObject = new ArrayList<>();
                 ///c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:val/c:numRef/c:numCache

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

@@ -14,9 +14,9 @@ public class TestOutSideExcel {
 
 
     public static void main(String[] args) throws IOException, InvalidFormatException, InterruptedException, ParserConfigurationException, SAXException, XPathExpressionException, DocumentException {
-        String sourceDoc = "D:\\dsWork\\YunNanDsBase\\Doc\\全省及州市县区人口与教育报告集20241023\\16个州市报告2022\\分析报告20240510\\临沧市人口变化及其对教育的影响20240419.docx";
+        String sourceDoc = "D:\\dsWork\\YunNanDsBase\\Doc\\全省及州市县区人口与教育报告集20241023\\133个县区报告2022\\县区研究报告\\丽江市各县区报告5\\宁蒗县\\宁蒗县人口变化及其对教育的影响.docx";
         //需要第几个图表
-        for (int chartNumber = 5; chartNumber <= 5; chartNumber++) {
+        for (int chartNumber = 36; chartNumber <= 37; chartNumber++) {
             System.out.println("正在处理第" + chartNumber + "个图表的信息~");
             //读取图表
             List<List<String>> list = ExcelKit.readChart(sourceDoc, chartNumber);

src/main/java/com/dsideal/base/Tools/Util/ReadDocxUtil.java

@@ -78,7 +78,8 @@ public class ReadDocxUtil {
             listCity.add(record.getStr("area_name"));
         }
         //城市名称的前两位一样就视为一样
-        String top2 = fileName.substring(0, 2);
+        String result = fileName.replaceAll("^[^\u4e00-\u9fa5]++", "");//去掉开头非中文符号
+        String top2 = result.substring(0, 2);
 
         //判断是哪个城市
         boolean found = false;