diff --git a/Doc/待处理/区/【9】城镇&乡村人口变化及预测-双/城镇&乡村人口变化及预测-双.xlsx b/Doc/待处理/区/【9】城镇&乡村人口变化及预测-双/城镇&乡村人口变化及预测-双.xlsx index 0b87370d..379e0dcf 100644 Binary files a/Doc/待处理/区/【9】城镇&乡村人口变化及预测-双/城镇&乡村人口变化及预测-双.xlsx and b/Doc/待处理/区/【9】城镇&乡村人口变化及预测-双/城镇&乡村人口变化及预测-双.xlsx differ diff --git a/Doc/待处理/区/【9】城镇&乡村人口变化及预测-双/城镇&乡村人口变化及预测-双【成果】.xlsx b/Doc/待处理/区/【9】城镇&乡村人口变化及预测-双/城镇&乡村人口变化及预测-双【成果】.xlsx deleted file mode 100644 index 242db5bd..00000000 Binary files a/Doc/待处理/区/【9】城镇&乡村人口变化及预测-双/城镇&乡村人口变化及预测-双【成果】.xlsx and /dev/null differ 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 d7afe729..13a2f6c3 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 @@ -98,11 +98,6 @@ public class A9 { String xmlPath = ExcelKit.DocxUnzipDirectory + "word\\charts\\chart" + chartNumber + ".xml"; mul = ExcelKit.getMul(xmlPath); - if (file.getName().contains("个旧")) { - System.out.println("mul=" + mul); - System.out.println("Here"); - } - for (List row : source1) { String year = row.getFirst().split("\\.")[0]; Row outRow = outSheet.createRow(++rowIndex); diff --git a/src/main/java/com/dsideal/base/Tools/FillData/ExcelKit/ExcelKit.java b/src/main/java/com/dsideal/base/Tools/FillData/ExcelKit/ExcelKit.java index 4c890c56..cd97c6ff 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/ExcelKit/ExcelKit.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/ExcelKit/ExcelKit.java @@ -1,5 +1,6 @@ package com.dsideal.base.Tools.FillData.ExcelKit; +import cn.hutool.core.io.FileUtil; import com.dsideal.base.DataEase.Model.ExcelReader; import com.jfinal.kit.StrKit; import org.apache.commons.io.FileUtils; @@ -649,22 +650,15 @@ public class ExcelKit { /** * 获取单位 + * * @param xmlPath * @return */ public static int getMul(String xmlPath) { - try { - SAXReader reader = new SAXReader(); // 创建 SAXReader 对象,读取 XML 文件 - Document document = reader.read(new File(xmlPath)); - String xpath = "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:title/c:tx/c:rich/a:p/a:r/a:t"; - Node node = document.selectSingleNode(xpath); - String s = node.getText(); - if (s.contains("万")) return 10000; - if (s.contains("千")) return 1000; - if (s.contains("百")) return 100; - } catch (Exception err) { - System.out.println(err); - } + String s = FileUtil.readUtf8String(xmlPath); + if (s.contains("万")) return 10000; + if (s.contains("千")) return 1000; + if (s.contains("百")) return 100; return 1; } } diff --git a/src/main/java/com/dsideal/base/Tools/Test/TestDanWei.java b/src/main/java/com/dsideal/base/Tools/Test/TestDanWei.java index 4686ae9a..b27de5e6 100644 --- a/src/main/java/com/dsideal/base/Tools/Test/TestDanWei.java +++ b/src/main/java/com/dsideal/base/Tools/Test/TestDanWei.java @@ -15,9 +15,9 @@ import java.io.IOException; public class TestDanWei { 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); - String xmlPath = ExcelKit.DocxUnzipDirectory + "word\\charts\\chart" + 37 + ".xml"; + String xmlPath = ExcelKit.DocxUnzipDirectory + "word\\charts\\chart" + 2 + ".xml"; int mul = ExcelKit.getMul(xmlPath); System.out.println(mul); }