From b77bfbcde9b3f0932cec6e259461ee5e08b8ebff Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 23 七月 2021 18:18:51 +0800
Subject: [PATCH] 1.修改部分bug

---
 src/main/java/com/hx/util/ExcelUtil.java |  298 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 281 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/hx/util/ExcelUtil.java b/src/main/java/com/hx/util/ExcelUtil.java
index 1191dcd..5e9c4d6 100644
--- a/src/main/java/com/hx/util/ExcelUtil.java
+++ b/src/main/java/com/hx/util/ExcelUtil.java
@@ -1,24 +1,31 @@
 package com.hx.util;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
+import com.hx.exception.TipsException;
+import org.apache.poi.POIXMLDocument;
+import org.apache.poi.hssf.usermodel.*;
+import org.apache.poi.openxml4j.opc.OPCPackage;
+import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFCell;
+import org.apache.poi.xssf.usermodel.XSSFRow;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.*;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
-
 import java.util.List;
 import java.util.Map;
 
-import com.hx.exception.TipsException;
-import org.apache.poi.hssf.usermodel.*;
-import org.apache.poi.ss.usermodel.Cell;
-import org.springframework.web.multipart.MultipartFile;
-
 
 /**
- * 
+ *
  * @author hjr
  */
 public final class ExcelUtil {
@@ -37,8 +44,8 @@
 	 * @throws Exception
 	 */
 	public static String createExcel(String outPath, String excelName,
-			String[] headList, String[] fieldList,
-			List<Map<String, Object>> dataList) throws Exception {
+									 String[] headList, String[] fieldList,
+									 List<Map<String, Object>> dataList) throws Exception {
 
 		String filePath = null;
 		// 鍒涘缓鏂扮殑Excel 宸ヤ綔绨�
@@ -80,7 +87,7 @@
 		}
 
 		// 鏂板缓涓�杈撳嚭鏂囦欢娴�
-		File file = SimpleTool.createFile(outPath,excelName);
+		File file = SimpleTool.createFile(outPath, excelName);
 		FileOutputStream fOut = new FileOutputStream(file);
 		// 鎶婄浉搴旂殑Excel 宸ヤ綔绨垮瓨鐩�
 		workbook.write(fOut);
@@ -106,7 +113,7 @@
 	 * @throws Exception
 	 */
 	public static File createExcel(String[] headList, String[] fieldList,
-									 List<Map<String, Object>> dataList) throws Exception {
+								   List<Map<String, Object>> dataList) throws Exception {
 		File file = File.createTempFile("temp", ".xls");
 		try{
 			// 鍒涘缓鏂扮殑Excel 宸ヤ綔绨�
@@ -256,10 +263,34 @@
 				return (String) obj;
 			} else if (obj instanceof Date) {
 				return null;// DateUtil.dateToString((Date)
-							// obj,DateUtil.DATESTYLE_SHORT_EX);
+				// obj,DateUtil.DATESTYLE_SHORT_EX);
 			} else {
 				return obj.toString();
 			}
+		}
+	}
+
+	/**
+	 * 璇诲彇Excel鏁版嵁
+	 * @param file
+	 * @param header
+	 * @return
+	 * @throws Exception
+	 */
+	public static List<List<String>> readExcelData(MultipartFile file, boolean header) throws Exception {
+
+		String fileName = file.getOriginalFilename();
+		if (!fileName.matches("^.+\\.(?i)(xls)$") && !fileName.matches("^.+\\.(?i)(xlsx)$")) {
+			throw new TipsException("涓婁紶鏂囦欢鏍煎紡涓嶆纭�");
+		}
+
+		//鍒ゆ柇涓嶅悓鏍煎紡澶勭悊鏂规硶涓嶅悓
+		if(fileName.matches("^.+\\.(?i)(xls)$")){
+			//xls鏍煎紡浣跨敤HSSF
+			return readExcelByeFileData(file, header);
+		}else{
+			//xlsx鏍煎紡浣跨敤XSSF
+			return readExcelByeFileDataToXSSF(file, header);
 		}
 	}
 
@@ -339,7 +370,11 @@
 							arrayString.add("");
 							//arrayString[i] = "";
 						} else { // 濡傛灉EXCEL琛ㄦ牸涓殑鏁版嵁绫诲瀷涓哄瓧绗︿覆鍨�
-							arrayString.add(cell.getStringCellValue().trim());
+							if(cell.getCellType() != Cell.CELL_TYPE_BOOLEAN){
+								arrayString.add(cell.getStringCellValue().trim());
+							}else{
+								arrayString.add(cell.getBooleanCellValue() ? "TRUE" : "FALSE");
+							}
 							//arrayString[i] = cell.getStringCellValue().trim();
 						}
 					}
@@ -350,4 +385,233 @@
 		return list;
 	}
 
-}
+	/**
+	 * 璇诲彇 Excel鏂囦欢鍐呭
+	 *
+	 * @param file
+	 * @param header 鏄惁鍖呮嫭琛ㄥご
+	 * @return
+	 * @throws Exception
+	 */
+	public static List<List<String>> readExcelByeFileDataToXSSF(MultipartFile file, boolean header) throws Exception {
+
+		String fileName = file.getOriginalFilename();
+		if (!fileName.matches("^.+\\.(?i)(xls)$") && !fileName.matches("^.+\\.(?i)(xlsx)$")) {
+			throw new TipsException("涓婁紶鏂囦欢鏍煎紡涓嶆纭�");
+		}
+
+		// 缁撴灉闆�
+		List<List<String>> list = new ArrayList<>();
+
+		XSSFWorkbook xssfWorkbook = new XSSFWorkbook(file.getInputStream());
+
+		// 閬嶅巻璇ヨ〃鏍间腑鎵�鏈夌殑宸ヤ綔琛紝i琛ㄧず宸ヤ綔琛ㄧ殑鏁伴噺 getNumberOfSheets琛ㄧず宸ヤ綔琛ㄧ殑鎬绘暟
+		for(int s=0;s<xssfWorkbook.getNumberOfSheets();s++) {
+			XSSFSheet xssfSheet = xssfWorkbook.getSheetAt(s);
+			int col = 0;
+			// 閬嶅巻璇ヨ鎵�鏈夌殑琛�,j琛ㄧず琛屾暟 getPhysicalNumberOfRows琛岀殑鎬绘暟 鍘婚櫎鏍囬
+			for (int j = 0; j < xssfSheet.getPhysicalNumberOfRows(); j++) {
+				XSSFRow xssfrow = xssfSheet.getRow(j);
+				if(xssfrow!=null){
+					if(j == 0) {
+						col = xssfrow.getPhysicalNumberOfCells();
+						if(!header) {
+							//涓嶅寘鎷〃澶�
+							continue;
+						}
+					}
+					// 鍗曡鏁版嵁
+					List<String> arrayString = new ArrayList<>();
+					for (int i = 0; i < col; i++) {
+						XSSFCell cell = xssfrow.getCell(i);
+						if (cell == null) {
+							arrayString.add("");
+						} else if (cell.getCellType() == 0) {
+							// arrayString[i] = new Double(cell.getNumericCellValue()).toString();
+							if (XSSFCell.CELL_TYPE_NUMERIC == cell.getCellType()) {
+								short format = cell.getCellStyle().getDataFormat();
+								if(format == 14 || format == 31 || format == 57 || format == 58){
+									//鏃ユ湡锛堜腑鏂囨椂闂存牸寮忕殑锛�
+									Date d = cell.getDateCellValue();
+									DateFormat formater = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+									// DateFormat formater = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+									arrayString.add(formater.format(d));
+									//arrayString[i] = formater.format(d);
+								}else if (HSSFDateUtil.isCellDateFormatted(cell)) {
+									Date d = cell.getDateCellValue();
+									//DateFormat formater = new SimpleDateFormat("yyyy骞碝M鏈坉d鏃� HH鏃秏m鍒唖s绉�");
+									DateFormat formater = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+									arrayString.add(formater.format(d));
+									//arrayString[i] = formater.format(d);
+								} else {
+									if(XSSFCell.CELL_TYPE_STRING == cell.getCellType()){
+										arrayString.add(cell.getStringCellValue());
+										//arrayString[i] =cell.getStringCellValue();
+									}else if(XSSFCell.CELL_TYPE_FORMULA==cell.getCellType()){
+										arrayString.add(cell.getCellFormula());
+										//arrayString[i] =cell.getCellFormula();
+									}else if(XSSFCell.CELL_TYPE_NUMERIC== cell.getCellType()){
+										HSSFDataFormatter dataFormatter = new HSSFDataFormatter();
+										arrayString.add(dataFormatter.formatCellValue(cell));
+										//arrayString[i] =dataFormatter.formatCellValue(cell);
+									}
+								}
+							}
+						} else if(cell.getCellType() == Cell.CELL_TYPE_BLANK){
+							arrayString.add("");
+							//arrayString[i] = "";
+						} else { // 濡傛灉EXCEL琛ㄦ牸涓殑鏁版嵁绫诲瀷涓哄瓧绗︿覆鍨�
+							if(cell.getCellType() != Cell.CELL_TYPE_BOOLEAN){
+								arrayString.add(cell.getStringCellValue().trim());
+							}else{
+								arrayString.add(cell.getBooleanCellValue() ? "TRUE" : "FALSE");
+							}
+
+
+							//arrayString[i] = cell.getStringCellValue().trim();
+						}
+					}
+					list.add(arrayString);
+				}
+			}
+		}
+		return list;
+	}
+
+
+	/**鍒ゆ柇excel鐨勭増鏈�*/
+	public static Workbook create(InputStream inp) throws Exception {
+		if (!inp.markSupported()) {
+			inp = new PushbackInputStream(inp, 8);
+		}
+		if (POIFSFileSystem.hasPOIFSHeader(inp)) {
+			return new HSSFWorkbook(inp);
+		}
+		if (POIXMLDocument.hasOOXMLHeader(inp)) {
+			return new XSSFWorkbook(OPCPackage.open(inp));
+		}
+		throw new IllegalArgumentException("浣犵殑excel鐗堟湰鐩墠poi瑙f瀽涓嶄簡");
+	}
+
+	/**璇诲彇excel鏂囦欢锛屽吋瀹�2003鍜�2007
+	 * 閫氳繃娴佽鍙朎xcel鏂囦欢
+	 * @return
+	 * @throws Exception
+	 */
+	public static List<List<String>> getExcelDataCompatible(MultipartFile file,boolean header) throws Exception {
+		try {
+
+			String fileName = file.getOriginalFilename();
+			if (!fileName.matches("^.+\\.(?i)(xls)$") && !fileName.matches("^.+\\.(?i)(xlsx)$")) {
+				throw new TipsException("涓婁紶鏂囦欢鏍煎紡涓嶆纭�");
+			}
+
+			// 缁撴灉闆�
+			List<List<String>> list = new ArrayList<>();
+			Workbook book = create(new BufferedInputStream(file.getInputStream()));
+
+			// 閬嶅巻璇ヨ〃鏍间腑鎵�鏈夌殑宸ヤ綔琛紝i琛ㄧず宸ヤ綔琛ㄧ殑鏁伴噺 getNumberOfSheets琛ㄧず宸ヤ綔琛ㄧ殑鎬绘暟
+			for(int s=0;s<book.getNumberOfSheets();s++) {
+				Sheet hssfsheet = book.getSheetAt(s);
+				int col = 0;
+				// 閬嶅巻璇ヨ鎵�鏈夌殑琛�,j琛ㄧず琛屾暟 getPhysicalNumberOfRows琛岀殑鎬绘暟 鍘婚櫎鏍囬
+				for (int j = 0; j < hssfsheet.getPhysicalNumberOfRows(); j++) {
+					Row hssfrow = hssfsheet.getRow(j);
+					if(hssfrow!=null){
+						if(j == 0) {
+							col = hssfrow.getPhysicalNumberOfCells();
+							if(!header) {
+								//涓嶅寘鎷〃澶�
+								continue;
+							}
+						}
+						// 鍗曡鏁版嵁
+						List<String> arrayString = new ArrayList<>();
+						for (int i = 0; i < col; i++) {
+							Cell cell = hssfrow.getCell(i);
+							if (cell == null) {
+								arrayString.add("");
+							} else if (cell.getCellType() == 0) {
+								// arrayString[i] = new Double(cell.getNumericCellValue()).toString();
+								if (HSSFCell.CELL_TYPE_NUMERIC == cell.getCellType()) {
+									short format = cell.getCellStyle().getDataFormat();
+									if(format == 14 || format == 31 || format == 57 || format == 58){
+										//鏃ユ湡锛堜腑鏂囨椂闂存牸寮忕殑锛�
+										Date d = cell.getDateCellValue();
+										DateFormat formater = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+										// DateFormat formater = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+										arrayString.add(formater.format(d));
+										//arrayString[i] = formater.format(d);
+									}else if (HSSFDateUtil.isCellDateFormatted(cell)) {
+										Date d = cell.getDateCellValue();
+										//DateFormat formater = new SimpleDateFormat("yyyy骞碝M鏈坉d鏃� HH鏃秏m鍒唖s绉�");
+										DateFormat formater = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+										arrayString.add(formater.format(d));
+										//arrayString[i] = formater.format(d);
+									} else {
+										if(HSSFCell.CELL_TYPE_STRING == cell.getCellType()){
+											arrayString.add(cell.getStringCellValue());
+											//arrayString[i] =cell.getStringCellValue();
+										}else if(HSSFCell.CELL_TYPE_FORMULA==cell.getCellType()){
+											arrayString.add(cell.getCellFormula());
+											//arrayString[i] =cell.getCellFormula();
+										}else if(HSSFCell.CELL_TYPE_NUMERIC== cell.getCellType()){
+											HSSFDataFormatter dataFormatter = new HSSFDataFormatter();
+											arrayString.add(dataFormatter.formatCellValue(cell));
+											//arrayString[i] =dataFormatter.formatCellValue(cell);
+										}
+									}
+								}
+							} else if(cell.getCellType() == Cell.CELL_TYPE_BLANK){
+								arrayString.add("");
+								//arrayString[i] = "";
+							} else { // 濡傛灉EXCEL琛ㄦ牸涓殑鏁版嵁绫诲瀷涓哄瓧绗︿覆鍨�
+								arrayString.add(cell.getStringCellValue().trim());
+								//arrayString[i] = cell.getStringCellValue().trim();
+							}
+						}
+						list.add(arrayString);
+					}
+				}
+			}
+			return list;
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	private static String getCellVal(Cell cell) {
+		if (null == cell) {
+			return "";
+		}
+		switch (cell.getCellType()) {
+			// 鏁板瓧
+			case HSSFCell.CELL_TYPE_NUMERIC:
+				// 鏃ユ湡鏍煎紡鐨勫鐞�
+				if (HSSFDateUtil.isCellDateFormatted(cell)) {
+					SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+					return sdf.format(HSSFDateUtil.getJavaDate(cell.getNumericCellValue())).toString();
+				}
+				return String.valueOf(cell.getNumericCellValue());
+			// 瀛楃涓�
+			case HSSFCell.CELL_TYPE_STRING:
+				return cell.getStringCellValue();
+			// 鍏紡
+			case HSSFCell.CELL_TYPE_FORMULA:
+				return cell.getCellFormula();
+			// 绌虹櫧
+			case HSSFCell.CELL_TYPE_BLANK:
+				return "";
+			case HSSFCell.CELL_TYPE_BOOLEAN:
+				return cell.getBooleanCellValue() + "";
+			// 閿欒绫诲瀷
+			case HSSFCell.CELL_TYPE_ERROR:
+				return cell.getErrorCellValue() + "";
+			default:
+				break;
+		}
+		return "";
+	}
+
+}
\ No newline at end of file

--
Gitblit v1.8.0