From e494248bd36d383b0c0cec2fbdbf206265ebfb53 Mon Sep 17 00:00:00 2001 From: duhui Date: Thu, 13 May 2021 11:47:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E8=A1=A8=E5=B7=A5=E5=85=B7=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/src/main/java/ExcelUtils.java | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/test/src/main/java/ExcelUtils.java b/test/src/main/java/ExcelUtils.java index cdc3fc337..8d96b7fa1 100644 --- a/test/src/main/java/ExcelUtils.java +++ b/test/src/main/java/ExcelUtils.java @@ -1,14 +1,12 @@ -import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.*; import org.apache.poi.xssf.usermodel.XSSFCell; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; import java.io.*; import java.util.*; public class ExcelUtils { private static boolean isWrite = true; - private static String excelPath ="E:\\work\\data_execl\\master_en\\base_data\\"; //excel 文件 + private static String excelPath ="D:\\A-duhui\\project\\data_execl\\master_zh_c\\base_data\\"; //excel 文件 // private static String excelPath ="D:/excel/0.94/data_execl/Map_data/"; //excel 文件 private static String path = "conf/server/"; private static Set oldFileNames = new HashSet<>(); @@ -363,29 +361,16 @@ public class ExcelUtils { //读取excel private static Workbook readExcel(String filePath) { - Workbook wb = null; if (filePath == null) { return null; } - String extString = filePath.substring(filePath.lastIndexOf(".")); - InputStream is; try { - is = new FileInputStream(filePath); - if (".xls".equals(extString)) { - return wb = new HSSFWorkbook(is); - } else if (".xlsx".equals(extString)) { - wb = new XSSFWorkbook(is); - return wb; - } else { - return wb = null; - } - - } catch (FileNotFoundException e) { - e.printStackTrace(); + InputStream is = new FileInputStream(filePath); + return WorkbookFactory.create(is); } catch (Exception e) { e.printStackTrace(); } - return wb; + return null; } public static Object getCellFormatValue(Cell cell,Cell cellType) {