diff --git a/src/main/java/com/dsideal/base/Tools/FillData/DataEaseKit/DsKit.java b/src/main/java/com/dsideal/base/Tools/FillData/DataEaseKit/DsKit.java index 58443792..1550568f 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/DataEaseKit/DsKit.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/DataEaseKit/DsKit.java @@ -356,7 +356,7 @@ public class DsKit { */ public static List> getChartData(String docPath, int chartNumber, int skipRowCount) throws IOException, DocumentException, InterruptedException, InvalidFormatException { DsKit.unCompress(docPath); - List> data = readChartByXml(docPath, chartNumber); + List> data = readChart(docPath, chartNumber); //需要跳过前skipRowCount行,先要判断一下是不是够跳的,不够跳的直接输出错误 if (data.size() < skipRowCount) { return null; @@ -522,7 +522,7 @@ public class DsKit { * * @param chartNumber */ - public static List> readChartByXml(String sourceDoc, int chartNumber) throws DocumentException, IOException { + public static List> readChart(String sourceDoc, int chartNumber) throws DocumentException, IOException { //将word文件解压缩 unCompress(sourceDoc); List> matrix = new ArrayList<>(); @@ -531,7 +531,7 @@ public class DsKit { System.out.println(sourceDoc + " 没有找到第" + chartNumber + "个图表"); return matrix; } - return readChartByXml(xml); + return readChart(xml); } /** @@ -562,7 +562,7 @@ public class DsKit { * @return * @throws DocumentException */ - public static List> readChartByXml(String xmlPath) throws DocumentException { + public static List> readChart(String xmlPath) throws DocumentException { //图表类型 String[] CHART_TYPES = {"lineChart", "barChart"};//折线,柱状