From a4f5d61287d4ab9e55c1f03ca47b078b5de511cb Mon Sep 17 00:00:00 2001
From: unknown <wangbin@taover.com>
Date: Wed, 1 Jan 2020 15:07:47 +0800
Subject: [PATCH] part utilExcel

---
 src/main/java/com/taover/util/UtilExcel.java | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 100 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/taover/util/UtilExcel.java b/src/main/java/com/taover/util/UtilExcel.java
index dca5e0c..866bfa2 100644
--- a/src/main/java/com/taover/util/UtilExcel.java
+++ b/src/main/java/com/taover/util/UtilExcel.java
@@ -11,7 +11,6 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.util.HSSFColor;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.CellType;
@@ -25,7 +24,7 @@ public class UtilExcel {
     private final static String excel2007U =".xlsx";   //2007+ 版本的excel
     private final static String CSV =".csv";   //csv
     
-    private final static int maxExcelRowNum = 5000;
+    private final static int maxExcelRowNum = 10000;
     private final static int maxExcelColumnNum = 50;
     
     /** 
@@ -245,6 +244,20 @@ public class UtilExcel {
 	}
 	
 	/**
+	 * 读取excel表--当前激活的工作表
+	 * @param path
+	 */
+	public static List<List<Object>> readExcel(String filepath, int rowLimit) throws Exception{
+		File file = new File(filepath);
+		List<List<Object>> result = new ArrayList<List<Object>>();
+		if(!file.exists()){
+			return result;
+		}
+		Workbook wb = UtilExcel.getWorkbook(filepath, true);
+		return readExcelBySheetIndex(filepath, wb.getActiveSheetIndex());
+	}
+	
+	/**
 	 * 读取
 	 * @param filepath
 	 * @return
@@ -297,8 +310,43 @@ public class UtilExcel {
 		int start = sheet.getFirstRowNum();
 		int end = sheet.getLastRowNum();
 		if(end > UtilExcel.maxExcelRowNum){
-			end = UtilExcel.maxExcelRowNum;
+			throw new Exception("目前系统只支持读取10000行以内记录，您当前Excel行数过大");
+		}
+		for(int i=start; i<end+1; ++i){
+			Row row = sheet.getRow(i);
+			if(row == null){
+				continue;
+			}
+			List<Object> dataRow = new ArrayList<Object>();
+			int lastCellNum = row.getLastCellNum();
+			if(lastCellNum > UtilExcel.maxExcelColumnNum){
+				lastCellNum = UtilExcel.maxExcelColumnNum;
+			}
+			for(int j=0; j<lastCellNum; ++j){
+				try {
+					dataRow.add(getCellValue(row.getCell(j), df));
+				}catch(Exception e) {
+					dataRow.add("");
+					e.printStackTrace();
+				}
+			}
+			result.add(dataRow);
+		}
+		return result;
+	}
+	
+	/**
+	 * 读取excel表--当前激活的工作表
+	 * @param path
+	 */
+	public static List<List<Object>> readExcelBySheet(Sheet sheet, int rowLimit) throws Exception{
+		List<List<Object>> result = new ArrayList<List<Object>>();
+		int start = sheet.getFirstRowNum();
+		int end = sheet.getLastRowNum();
+		if(end > rowLimit){
+			end = rowLimit;
 		}
+		DecimalFormat df = new DecimalFormat("0");
 		for(int i=start; i<end+1; ++i){
 			Row row = sheet.getRow(i);
 			if(row == null){
@@ -368,7 +416,7 @@ public class UtilExcel {
 		int start = sheet.getFirstRowNum();
 		int end = sheet.getLastRowNum();
 		if(end > UtilExcel.maxExcelRowNum){
-			end = UtilExcel.maxExcelRowNum;
+			throw new Exception("目前系统只支持读取10000行以内记录，您当前Excel行数过大");
 		}
 		for(int i=start; i<end+1; ++i){
 			Row row = sheet.getRow(i);
@@ -411,6 +459,54 @@ public class UtilExcel {
 		return result;
 	}
 	
+	public static List<List<Object>> readExcelBySheetExcludeHideLine(Sheet sheet, int rowLimit) throws Exception{
+		List<List<Object>> result = new ArrayList<List<Object>>();
+		DecimalFormat df = new DecimalFormat("0");
+		int start = sheet.getFirstRowNum();
+		int end = sheet.getLastRowNum();
+		if(end > rowLimit){
+			end = rowLimit;
+		}
+		for(int i=start; i<end+1; ++i){
+			Row row = sheet.getRow(i);
+			if(row == null){
+				continue;
+			}
+			//去除隐藏行
+			if(row.getZeroHeight()){
+				continue;
+			}
+			List<Object> dataRow = new ArrayList<Object>();
+			int lastCellNum = row.getLastCellNum();
+			if(lastCellNum > UtilExcel.maxExcelColumnNum){
+				lastCellNum = UtilExcel.maxExcelColumnNum;
+			}
+			for(int j=0; j<lastCellNum; ++j){
+				Cell cell = row.getCell(j);
+				if(cell != null){
+					CellType currCellType = cell.getCellTypeEnum();
+					
+					if(currCellType.compareTo(CellType.STRING) == 0){
+						dataRow.add(UtilString.trimCodePage(cell.getRichStringCellValue().getString()));	
+					}else if(currCellType.compareTo(CellType.NUMERIC) == 0){
+						dataRow.add(df.format(cell.getNumericCellValue()));						
+					}else if(currCellType.compareTo(CellType.BOOLEAN) == 0){
+						dataRow.add(cell.getBooleanCellValue());
+					}else if(currCellType.compareTo(CellType.FORMULA) == 0
+							|| currCellType.compareTo(CellType.BLANK) == 0
+							|| currCellType.compareTo(CellType.ERROR) == 0){
+						dataRow.add("");
+					}				
+					
+				}else{
+					dataRow.add("");
+				}
+			}
+			result.add(dataRow);
+		}
+		return result;
+	}
+	
 	public static void main(String args[]){
 		//String filepath = "C:\\Users\\root\\Desktop\\千丁-6.27.xlsx";
 		String filepath = "C:\\Users\\EDZ\\Desktop\\榴莲1 (5).xlsx";
--
libgit2 0.21.2