From 0546530fe7e1696cf3ae4eaf9e79a5e7c4e203fe Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期四, 21 七月 2022 18:43:26 +0800
Subject: [PATCH] Merge branch 'master' of http://1.15.4.62/r/~chenjiahe/hx_common

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

diff --git a/src/main/java/com/hx/util/ExcelUtil.java b/src/main/java/com/hx/util/ExcelUtil.java
index 5e9c4d6..a6dfaac 100644
--- a/src/main/java/com/hx/util/ExcelUtil.java
+++ b/src/main/java/com/hx/util/ExcelUtil.java
@@ -498,6 +498,97 @@
 	 * @return
 	 * @throws Exception
 	 */
+	public static List<List<String>> getExcelDataCompatible(File file,boolean header) throws Exception {
+		try {
+
+			String fileName = file.getName();
+			if (!fileName.matches("^.+\\.(?i)(xls)$") && !fileName.matches("^.+\\.(?i)(xlsx)$")) {
+				throw new TipsException("涓婁紶鏂囦欢鏍煎紡涓嶆纭�");
+			}
+
+			// 缁撴灉闆�
+			List<List<String>> list = new ArrayList<>();
+			Workbook book = create(new BufferedInputStream(new FileInputStream(file)));
+
+			// 閬嶅巻璇ヨ〃鏍间腑鎵�鏈夌殑宸ヤ綔琛紝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;
+	}
+
+
+
+
+	/**璇诲彇excel鏂囦欢锛屽吋瀹�2003鍜�2007
+	 * 閫氳繃娴佽鍙朎xcel鏂囦欢
+	 * @return
+	 * @throws Exception
+	 */
 	public static List<List<String>> getExcelDataCompatible(MultipartFile file,boolean header) throws Exception {
 		try {
 

--
Gitblit v1.8.0