diff --git a/Doc/待处理/区/【8】总人口变化及预测-双/总人口变化及预测-双-(万人).xlsx b/Doc/待处理/区/【8】总人口变化及预测-双/总人口变化及预测-双-(万人).xlsx index af9996a9..6ed631cd 100644 Binary files a/Doc/待处理/区/【8】总人口变化及预测-双/总人口变化及预测-双-(万人).xlsx and b/Doc/待处理/区/【8】总人口变化及预测-双/总人口变化及预测-双-(万人).xlsx differ diff --git a/Doc/待处理/区/【8】总人口变化及预测-双/总人口变化及预测-双-(万人)【成果】.xlsx b/Doc/待处理/区/【8】总人口变化及预测-双/总人口变化及预测-双-(万人)【成果】.xlsx new file mode 100644 index 00000000..d0cacfee Binary files /dev/null and b/Doc/待处理/区/【8】总人口变化及预测-双/总人口变化及预测-双-(万人)【成果】.xlsx differ diff --git a/src/main/java/com/dsideal/base/Tools/FillData/Area/A8.java b/src/main/java/com/dsideal/base/Tools/FillData/Area/A8.java index bd02ce4a..4d0c3ce6 100644 --- a/src/main/java/com/dsideal/base/Tools/FillData/Area/A8.java +++ b/src/main/java/com/dsideal/base/Tools/FillData/Area/A8.java @@ -89,12 +89,13 @@ public class A8 { System.out.println("发现异常数据,请人工处理:" + file.getName()); System.exit(0); } + //县区名称 + //System.out.println("正在进行" + cityName + "-" + areaName + "的数据填充~"); int firstChartNumber = 1; List> source1 = ExcelKit.getChartData(file.getAbsolutePath(), firstChartNumber - 1, 6);//从2017年开始 - //县区名称 - System.out.println("正在进行" + cityName + "-" + areaName + "的数据填充~"); + } } //保存文件 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 bbe768e2..8e632f80 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 @@ -141,8 +141,6 @@ public class ExcelKit { // 遍历工作表中的所有行 if (sheet == null) return array; - System.out.println("readSheet数据数量=" + sheet.getLastRowNum()); - for (Row row : sheet) { rowIndex++; if (rowIndex <= skipRowCount) continue;//跳过指定的行数 @@ -361,8 +359,8 @@ public class ExcelKit { List> data = ExcelKit.readSheet(workbook, skipRowCount); is.close(); if (data.isEmpty()) { - System.out.println("第" + (chartNumber + 1) + "个图表,Sheet个数="+workbook.getNumberOfSheets()+",Sheet名称="+workbook.getSheetAt(0).getSheetName()+",数据为空,请检查表格是否为空"); - System.exit(-1); + System.out.println(docPath + ",第" + (chartNumber + 1) + "个图表,存在数据外链接情况,请人为处理!"); + // System.exit(-1); } return data; } @@ -489,7 +487,7 @@ public class ExcelKit { } } - public static void ReadChart(String sourceWord) throws IOException, InvalidFormatException { + public static void ReadChart(String sourceWord) throws IOException, InvalidFormatException { InputStream is = new FileInputStream(sourceWord); ZipSecureFile.setMinInflateRatio(-1.0d); XWPFDocument doc = new XWPFDocument(is);