From a30695d15a46ef43dc59e4d1c7ddd948d16094a0 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期四, 26 十月 2023 11:27:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/hx/util/ExcelUtil.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/hx/util/ExcelUtil.java b/src/main/java/com/hx/util/ExcelUtil.java
index 9c789f8..da09b9b 100644
--- a/src/main/java/com/hx/util/ExcelUtil.java
+++ b/src/main/java/com/hx/util/ExcelUtil.java
@@ -3,6 +3,7 @@
import com.hx.exception.TipsException;
import com.monitorjbl.xlsx.StreamingReader;
import org.apache.poi.hssf.usermodel.*;
+import org.apache.poi.openxml4j.exceptions.OLE2NotOfficeXmlFileException;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
import org.apache.poi.xssf.usermodel.XSSFCell;
@@ -884,7 +885,10 @@
.bufferSize(10240)
.open(new FileInputStream(file));
listData =readhandle(book);
- }catch (Exception e){
+ }catch (OLE2NotOfficeXmlFileException ex){
+ ex.printStackTrace();
+ throw new RuntimeException("excel鐗堟湰涓嶄负2007鍙婁互涓�");
+ } catch (Exception e){
e.printStackTrace();
throw new RuntimeException(e.getMessage());
}
@@ -912,7 +916,10 @@
.open(new BufferedInputStream(file.getInputStream()));
listData =readhandle(book);
- }catch (Exception e){
+ }catch (OLE2NotOfficeXmlFileException ex){
+ ex.printStackTrace();
+ throw new RuntimeException("excel鐗堟湰涓嶄负2007鍙婁互涓�");
+ } catch (Exception e){
e.printStackTrace();
throw new RuntimeException(e.getMessage());
}
@@ -937,6 +944,9 @@
.open(file);
listData =readhandle(book);
+ }catch (OLE2NotOfficeXmlFileException ex){
+ ex.printStackTrace();
+ throw new RuntimeException("excel鐗堟湰涓嶄负2007鍙婁互涓�");
}catch (Exception e){
e.printStackTrace();
throw new RuntimeException(e.getMessage());
--
Gitblit v1.8.0