From 2291fba3ed16336860050a4a18c6860cb2396b1b Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 27 二月 2024 17:04:43 +0800
Subject: [PATCH] 优化代码
---
java110-utils/src/main/java/com/java110/utils/util/ImportExcelUtils.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/java110-utils/src/main/java/com/java110/utils/util/ImportExcelUtils.java b/java110-utils/src/main/java/com/java110/utils/util/ImportExcelUtils.java
old mode 100644
new mode 100755
index 19d4efb..3d448f9
--- a/java110-utils/src/main/java/com/java110/utils/util/ImportExcelUtils.java
+++ b/java110-utils/src/main/java/com/java110/utils/util/ImportExcelUtils.java
@@ -82,6 +82,10 @@
*/
public static final List<Object[]> listFromSheet(Sheet sheet) {
+ if(sheet == null){
+ throw new IllegalArgumentException("excel sheet 鏈壘鍒帮紝璇蜂笉瑕佺鏀筫xcel妯℃澘");
+ }
+
List<Object[]> list = new ArrayList<Object[]>();
for (int r = sheet.getFirstRowNum(); r <= sheet.getLastRowNum(); r++) {
Row row = sheet.getRow(r);
@@ -124,8 +128,7 @@
result = df.format(((HSSFCell) cell).getNumericCellValue());
break;
case HSSFCell.CELL_TYPE_FORMULA:
- result = ((HSSFCell) cell).getNumericCellValue();
- break;
+ throw new IllegalArgumentException("璇蜂笉瑕佸叕寮忚绠楋紝绋嬪簭娌℃硶璁＄畻Excel鐨勫叕寮�");
case HSSFCell.CELL_TYPE_BOOLEAN:
result = ((HSSFCell) cell).getBooleanCellValue();
break;
@@ -153,8 +156,8 @@
result = df.format(((XSSFCell) cell).getNumericCellValue());
break;
case XSSFCell.CELL_TYPE_FORMULA:
- result = ((XSSFCell) cell).getNumericCellValue();
- break;
+ //result = ((XSSFCell) cell).getNumericCellValue();
+ throw new IllegalArgumentException("璇蜂笉瑕佸叕寮忚绠楋紝绋嬪簭娌℃硶璁＄畻Excel鐨勫叕寮�");
case XSSFCell.CELL_TYPE_BOOLEAN:
result = ((XSSFCell) cell).getBooleanCellValue();
break;
--
Gitblit v1.8.0