From 14ff970982c56fcc836912c50d02fe9ce9530c84 Mon Sep 17 00:00:00 2001 From: wangbin Date: Wed, 25 Mar 2020 22:19:20 +0800 Subject: [PATCH] 1.Excel读取允许最大行变更，不抛出异常 --- build.gradle | 2 +- src/main/java/com/taover/util/UtilExcel.java | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 6933491..375439f 100644 --- a/build.gradle +++ b/build.gradle @@ -59,7 +59,7 @@ uploadArchives { authentication(userName: NEXUS_USERNAME, password: NEXUS_PASSWORD) } pom.project { - version '1.1.76' + version '1.1.77' artifactId ARTIFACT_Id groupId GROUP_ID packaging TYPE diff --git a/src/main/java/com/taover/util/UtilExcel.java b/src/main/java/com/taover/util/UtilExcel.java index 0ef3a67..b0178a9 100644 --- a/src/main/java/com/taover/util/UtilExcel.java +++ b/src/main/java/com/taover/util/UtilExcel.java @@ -382,10 +382,6 @@ public class UtilExcel { } Workbook wb = UtilExcel.getWorkbook(filepath, true); Sheet sheet = wb.getSheetAt(sheetIndex); - int end = sheet.getLastRowNum(); - if(end > UtilExcel.maxExcelRowNum){ - throw new Exception("目前系统只支持读取10000行以内记录，您当前Excel行数过大"); - } return readExcelBySheet(sheet, UtilExcel.maxExcelRowNum, false); } @@ -398,7 +394,7 @@ public class UtilExcel { int end = sheet.getLastRowNum(); if(hasRowLimit){ if(end > UtilExcel.maxExcelRowNum) { - throw new Exception("目前系统只支持读取10000行以内记录，您当前Excel行数过大"); + throw new Exception("目前系统只支持读取"+UtilExcel.maxExcelRowNum+"行以内记录，您当前Excel行数过大"); } return readExcelBySheet(sheet, UtilExcel.maxExcelRowNum, false); }else { @@ -492,10 +488,6 @@ public class UtilExcel { } Workbook wb = UtilExcel.getWorkbook(filepath, true); Sheet sheet = wb.getSheetAt(sheetIndex); - int end = sheet.getLastRowNum(); - if(end > UtilExcel.maxExcelRowNum){ - throw new Exception("目前系统只支持读取10000行以内记录，您当前Excel行数过大"); - } return readExcelBySheet(sheet, UtilExcel.maxExcelRowNum, true); } -- libgit2 0.21.2