'commit'

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

@@ -64,34 +64,10 @@ public class A1 {
                 System.out.println("正在进行" + cityName + "的数据填充~");
                 //如果源文件或者示例文件是xls格式，则转化为xlsx格式
                 String sourceExcel = file.getAbsolutePath();
-                sourceExcel = ExcelKit.ConvertXlsToXlsx(sourceExcel);
-                //它的最后一个有效数据行，就是这个城市的整体数据汇总
-                List<List<String>> sheetList = ExcelKit.readSheet(sourceExcel, 4);//此表格有4行表头
-                //最后一行的数据就是整个市州的数据
-                List<String> rowData = sheetList.getLast();
+                List<List<String>> dataList=ExcelKit.readSecondTable(sourceExcel, 0, "自动计算招生数、在校生数",
+                        2, "K");
 
-                try {
-                    Row outRow = outSheet.createRow(++rowIndex);
-                    Double allCount = Double.parseDouble(rowData.get(ExcelKit.transLetter2Num("B"))) / 10000;
-                    Double chengZhenCount = Double.parseDouble(rowData.get(ExcelKit.transLetter2Num("D"))) / 10000;
-                    Double xiangChunCount = Double.parseDouble(rowData.get(ExcelKit.transLetter2Num("E"))) / 10000;
-                    Double lv =
-                            Double.parseDouble(rowData.get(ExcelKit.transLetter2Num("D"))) /
-                                    Integer.parseInt(rowData.get(ExcelKit.transLetter2Num("B")));
-                    //需要保留两位小数
-                    lv = Double.parseDouble(String.format("%.2f", lv));
-                    ExcelKit.putData(outRow, Arrays.asList(cityName, "总人口",Double.parseDouble(String.format("%.2f", allCount))+"" , "万人", "云南省"), dataStyle);
-                    outRow = outSheet.createRow(++rowIndex);
-                    ExcelKit.putData(outRow, Arrays.asList(cityName, "城镇人口",Double.parseDouble(String.format("%.2f", chengZhenCount))+"", "万人", "云南省"), dataStyle);
-                    outRow = outSheet.createRow(++rowIndex);
-                    ExcelKit.putData(outRow, Arrays.asList(cityName, "乡村人口", Double.parseDouble(String.format("%.2f", xiangChunCount))+"", "万人", "云南省"), dataStyle);
-                    outRow = outSheet.createRow(++rowIndex);
-                    ExcelKit.putData(outRow, Arrays.asList(cityName, "城镇化率", lv + "%", "", "云南省"), dataStyle);
-                } catch (Exception err) {
-                    System.out.println("错误数据：");
-                    System.out.println(rowData);
-                    System.exit(0);
-                }
+                System.out.println(dataList);
             }
         }
         //保存文件

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

@@ -520,6 +520,7 @@ public class ExcelKit {
      */
     public static List<List<String>> readSecondTable(String filePath, int sheetIndex,
                                                      String keyword, int headRows, int tableWidth) throws IOException {
+        filePath = ConvertXlsToXlsx(filePath);
         List<List<String>> dataList = new ArrayList<>();
         FileInputStream fis = new FileInputStream(filePath);
         Workbook workbook = new XSSFWorkbook(fis);