From 72950f60dee7b842c81feea579ec02b078914e78 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 07 十一月 2023 16:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/hx/util/ExcelUtil.java | 511 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 277 insertions(+), 234 deletions(-)
diff --git a/src/main/java/com/hx/util/ExcelUtil.java b/src/main/java/com/hx/util/ExcelUtil.java
index d5c0f2a..da09b9b 100644
--- a/src/main/java/com/hx/util/ExcelUtil.java
+++ b/src/main/java/com/hx/util/ExcelUtil.java
@@ -1,13 +1,15 @@
package com.hx.util;
import com.hx.exception.TipsException;
-import org.apache.poi.POIXMLDocument;
+import com.monitorjbl.xlsx.StreamingReader;
import org.apache.poi.hssf.usermodel.*;
-import org.apache.poi.openxml4j.opc.OPCPackage;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.apache.poi.openxml4j.exceptions.OLE2NotOfficeXmlFileException;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.apache.poi.xssf.usermodel.*;
+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 javax.imageio.ImageIO;
@@ -61,7 +63,7 @@
// 鍦ㄧ储寮�0鐨勪綅缃垱寤哄崟鍏冩牸锛堝乏涓婄锛�
cell = row.createCell(i);
// 瀹氫箟鍗曞厓鏍间负瀛楃涓茬被鍨�
- cell.setCellType(HSSFCell.CELL_TYPE_STRING);
+ //cell.setCellType(HSSFCell.CELL_TYPE_STRING);
// 鍦ㄥ崟鍏冩牸涓緭鍏ヤ竴浜涘唴瀹�
cell.setCellValue(headList[i]);
}
@@ -78,7 +80,7 @@
// 鍦ㄧ储寮�0鐨勪綅缃垱寤哄崟鍏冩牸锛堝乏涓婄锛�
cell = row_value.createCell(i);
// 瀹氫箟鍗曞厓鏍间负瀛楃涓茬被鍨�
- cell.setCellType(HSSFCell.CELL_TYPE_STRING);
+ //cell.setCellType(HSSFCell.CELL_TYPE_STRING);
// 鍦ㄥ崟鍏冩牸涓緭鍏ヤ竴浜涘唴瀹�
cell.setCellValue(objToString(dataMap.get(fieldList[i])));
}
@@ -131,7 +133,7 @@
// 鍦ㄧ储寮�0鐨勪綅缃垱寤哄崟鍏冩牸锛堝乏涓婄锛�
cell = row.createCell(i);
// 瀹氫箟鍗曞厓鏍间负瀛楃涓茬被鍨�
- cell.setCellType(HSSFCell.CELL_TYPE_STRING);
+ //cell.setCellType(HSSFCell.CELL_TYPE_STRING);
// 鍦ㄥ崟鍏冩牸涓緭鍏ヤ竴浜涘唴瀹�
cell.setCellValue(headList[i]);
}
@@ -148,7 +150,7 @@
// 鍦ㄧ储寮�0鐨勪綅缃垱寤哄崟鍏冩牸锛堝乏涓婄锛�
cell = row_value.createCell(i);
// 瀹氫箟鍗曞厓鏍间负瀛楃涓茬被鍨�
- cell.setCellType(HSSFCell.CELL_TYPE_STRING);
+ //cell.setCellType(HSSFCell.CELL_TYPE_STRING);
// 鍦ㄥ崟鍏冩牸涓緭鍏ヤ竴浜涘唴瀹�
cell.setCellValue(objToString(dataMap.get(fieldList[i])));
}
@@ -197,8 +199,8 @@
//鍚堝苟鐨勫崟鍏冩牸鏍峰紡
HSSFCellStyle boderStyle = workbook.createCellStyle();
//鍨傜洿灞呬腑
- boderStyle.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER);
- boderStyle.setAlignment(HSSFCellStyle.ALIGN_CENTER); // 鍒涘缓涓�涓眳涓牸寮�
+ boderStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+ boderStyle.setAlignment(HorizontalAlignment.CENTER); // 鍒涘缓涓�涓眳涓牸寮�
// 鍦‥xcel宸ヤ綔绨夸腑寤轰竴宸ヤ綔琛紝鍏跺悕涓虹己鐪佸��
// 濡傝鏂板缓涓�鍚嶄负"鏁堢泭鎸囨爣"鐨勫伐浣滆〃锛屽叾璇彞涓猴細
@@ -215,7 +217,7 @@
// 鍦ㄧ储寮�0鐨勪綅缃垱寤哄崟鍏冩牸锛堝乏涓婄锛�
cell = row.createCell(i);
// 瀹氫箟鍗曞厓鏍间负瀛楃涓茬被鍨�
- cell.setCellType(HSSFCell.CELL_TYPE_STRING);
+ //cell.setCellType(HSSFCell.CELL_TYPE_STRING);
// 鍦ㄥ崟鍏冩牸涓緭鍏ヤ竴浜涘唴瀹�
cell.setCellValue(headList[i]);
cell.setCellStyle(boderStyle);
@@ -235,7 +237,7 @@
sheet.setColumnWidth(i,width);
cell = row_value.createCell(i);
// 瀹氫箟鍗曞厓鏍间负瀛楃涓茬被鍨�
- cell.setCellType(HSSFCell.CELL_TYPE_STRING);
+ //cell.setCellType(HSSFCell.CELL_TYPE_STRING);
// 鍦ㄥ崟鍏冩牸涓緭鍏ヤ竴浜涘唴瀹�
cell.setCellValue(objToString(dataMap.get(fieldList[i])));
cell.setCellStyle(boderStyle);
@@ -288,8 +290,8 @@
//鍚堝苟鐨勫崟鍏冩牸鏍峰紡
CellStyle boderStyle = workbook.createCellStyle();
//鍨傜洿灞呬腑
- boderStyle.setVerticalAlignment(HSSFCellStyle.VERTICAL_CENTER);
- boderStyle.setAlignment(HSSFCellStyle.ALIGN_CENTER); // 鍒涘缓涓�涓眳涓牸寮�
+ boderStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+ boderStyle.setAlignment(HorizontalAlignment.CENTER); // 鍒涘缓涓�涓眳涓牸寮�
// 鍦‥xcel宸ヤ綔绨夸腑寤轰竴宸ヤ綔琛紝鍏跺悕涓虹己鐪佸��
// 濡傝鏂板缓涓�鍚嶄负"鏁堢泭鎸囨爣"鐨勫伐浣滆〃锛屽叾璇彞涓猴細
@@ -306,7 +308,7 @@
// 鍦ㄧ储寮�0鐨勪綅缃垱寤哄崟鍏冩牸锛堝乏涓婄锛�
cell = row.createCell(i);
// 瀹氫箟鍗曞厓鏍间负瀛楃涓茬被鍨�
- cell.setCellType(HSSFCell.CELL_TYPE_STRING);
+ //cell.setCellType(HSSFCell.CELL_TYPE_STRING);
// 鍦ㄥ崟鍏冩牸涓緭鍏ヤ竴浜涘唴瀹�
cell.setCellValue(headList[i]);
cell.setCellStyle(boderStyle);
@@ -326,7 +328,7 @@
sheet.setColumnWidth(i,width);
cell = row_value.createCell(i);
// 瀹氫箟鍗曞厓鏍间负瀛楃涓茬被鍨�
- cell.setCellType(HSSFCell.CELL_TYPE_STRING);
+ //cell.setCellType(HSSFCell.CELL_TYPE_STRING);
// 鍦ㄥ崟鍏冩牸涓緭鍏ヤ竴浜涘唴瀹�
cell.setCellValue(objToString(dataMap.get(fieldList[i])));
cell.setCellStyle(boderStyle);
@@ -431,9 +433,9 @@
HSSFCell cell = hssfrow.getCell(i);
if (cell == null) {
arrayString.add("");
- } else if (cell.getCellType() == 0) {
+ } else if (cell.getCellType() == CellType.NUMERIC) {
// arrayString[i] = new Double(cell.getNumericCellValue()).toString();
- if (HSSFCell.CELL_TYPE_NUMERIC == cell.getCellType()) {
+ if (CellType.NUMERIC == cell.getCellType()) {
short format = cell.getCellStyle().getDataFormat();
if(format == 14 || format == 31 || format == 57 || format == 58){
//鏃ユ湡锛堜腑鏂囨椂闂存牸寮忕殑锛�
@@ -449,24 +451,24 @@
arrayString.add(formater.format(d));
//arrayString[i] = formater.format(d);
} else {
- if(HSSFCell.CELL_TYPE_STRING == cell.getCellType()){
+ if(CellType.STRING == cell.getCellType()){
arrayString.add(cell.getStringCellValue());
//arrayString[i] =cell.getStringCellValue();
- }else if(HSSFCell.CELL_TYPE_FORMULA==cell.getCellType()){
+ }else if(CellType.FORMULA==cell.getCellType()){
arrayString.add(cell.getCellFormula());
//arrayString[i] =cell.getCellFormula();
- }else if(HSSFCell.CELL_TYPE_NUMERIC== cell.getCellType()){
+ }else if(CellType.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){
+ } else if(cell.getCellType() == CellType.BLANK){
arrayString.add("");
//arrayString[i] = "";
} else { // 濡傛灉EXCEL琛ㄦ牸涓殑鏁版嵁绫诲瀷涓哄瓧绗︿覆鍨�
- if(cell.getCellType() != Cell.CELL_TYPE_BOOLEAN){
+ if(cell.getCellType() != CellType.BOOLEAN){
arrayString.add(cell.getStringCellValue().trim());
}else{
arrayString.add(cell.getBooleanCellValue() ? "TRUE" : "FALSE");
@@ -522,9 +524,9 @@
XSSFCell cell = xssfrow.getCell(i);
if (cell == null) {
arrayString.add("");
- } else if (cell.getCellType() == 0) {
+ } else if (cell.getCellType() == CellType.NUMERIC) {
// arrayString[i] = new Double(cell.getNumericCellValue()).toString();
- if (XSSFCell.CELL_TYPE_NUMERIC == cell.getCellType()) {
+ if (CellType.NUMERIC == cell.getCellType()) {
short format = cell.getCellStyle().getDataFormat();
if(format == 14 || format == 31 || format == 57 || format == 58){
//鏃ユ湡锛堜腑鏂囨椂闂存牸寮忕殑锛�
@@ -540,24 +542,24 @@
arrayString.add(formater.format(d));
//arrayString[i] = formater.format(d);
} else {
- if(XSSFCell.CELL_TYPE_STRING == cell.getCellType()){
+ if(CellType.STRING == cell.getCellType()){
arrayString.add(cell.getStringCellValue());
//arrayString[i] =cell.getStringCellValue();
- }else if(XSSFCell.CELL_TYPE_FORMULA==cell.getCellType()){
+ }else if(CellType.FORMULA==cell.getCellType()){
arrayString.add(cell.getCellFormula());
//arrayString[i] =cell.getCellFormula();
- }else if(XSSFCell.CELL_TYPE_NUMERIC== cell.getCellType()){
+ }else if(CellType.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){
+ } else if(cell.getCellType() == CellType.BLANK){
arrayString.add("");
//arrayString[i] = "";
} else { // 濡傛灉EXCEL琛ㄦ牸涓殑鏁版嵁绫诲瀷涓哄瓧绗︿覆鍨�
- if(cell.getCellType() != Cell.CELL_TYPE_BOOLEAN){
+ if(cell.getCellType() != CellType.BOOLEAN){
arrayString.add(cell.getStringCellValue().trim());
}else{
arrayString.add(cell.getBooleanCellValue() ? "TRUE" : "FALSE");
@@ -576,17 +578,9 @@
/**鍒ゆ柇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瑙ｆ瀽涓嶄簡");
+ public static Workbook create(InputStream inp) throws IOException {
+ //杩欐牱鍐� excel 鑳藉吋瀹�03鍜�07
+ return WorkbookFactory.create(inp);
}
/**璇诲彇excel鏂囦欢锛屽吋瀹�2003鍜�2007
@@ -607,12 +601,20 @@
Workbook book = create(new BufferedInputStream(new FileInputStream(file)));
// 閬嶅巻璇ヨ〃鏍间腑鎵�鏈夌殑宸ヤ綔琛紝i琛ㄧず宸ヤ綔琛ㄧ殑鏁伴噺 getNumberOfSheets琛ㄧず宸ヤ綔琛ㄧ殑鎬绘暟
+ Sheet hssfsheet;
+ Row hssfrow;
+ List<String> arrayString;
+ Cell cell;
+ short format;
+ Date d;
+ DateFormat formater;
+ HSSFDataFormatter dataFormatter;
for(int s=0;s<book.getNumberOfSheets();s++) {
- Sheet hssfsheet = book.getSheetAt(s);
+ hssfsheet = book.getSheetAt(s);
int col = 0;
// 閬嶅巻璇ヨ鎵�鏈夌殑琛�,j琛ㄧず琛屾暟 getPhysicalNumberOfRows琛岀殑鎬绘暟 鍘婚櫎鏍囬
for (int j = 0; j < hssfsheet.getPhysicalNumberOfRows(); j++) {
- Row hssfrow = hssfsheet.getRow(j);
+ hssfrow = hssfsheet.getRow(j);
if(hssfrow!=null){
if(j == 0) {
col = hssfrow.getPhysicalNumberOfCells();
@@ -622,43 +624,43 @@
}
}
// 鍗曡鏁版嵁
- List<String> arrayString = new ArrayList<>();
+ arrayString = new ArrayList<>();
for (int i = 0; i < col; i++) {
- Cell cell = hssfrow.getCell(i);
+ cell = hssfrow.getCell(i);
if (cell == null) {
arrayString.add("");
- } else if (cell.getCellType() == 0) {
+ } else if (cell.getCellType() == CellType.NUMERIC) {
// arrayString[i] = new Double(cell.getNumericCellValue()).toString();
- if (HSSFCell.CELL_TYPE_NUMERIC == cell.getCellType()) {
- short format = cell.getCellStyle().getDataFormat();
+ if (CellType.NUMERIC == cell.getCellType()) {
+ 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");
+ d = cell.getDateCellValue();
+ 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();
+ d = cell.getDateCellValue();
//DateFormat formater = new SimpleDateFormat("yyyy骞碝M鏈坉d鏃� HH鏃秏m鍒唖s绉�");
- DateFormat formater = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+ 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()){
+ if(CellType.STRING == cell.getCellType()){
arrayString.add(cell.getStringCellValue());
//arrayString[i] =cell.getStringCellValue();
- }else if(HSSFCell.CELL_TYPE_FORMULA==cell.getCellType()){
+ }else if(CellType.FORMULA==cell.getCellType()){
arrayString.add(cell.getCellFormula());
//arrayString[i] =cell.getCellFormula();
- }else if(HSSFCell.CELL_TYPE_NUMERIC== cell.getCellType()){
- HSSFDataFormatter dataFormatter = new HSSFDataFormatter();
+ }else if(CellType.NUMERIC== cell.getCellType()){
+ dataFormatter = new HSSFDataFormatter();
arrayString.add(dataFormatter.formatCellValue(cell));
//arrayString[i] =dataFormatter.formatCellValue(cell);
}
}
}
- } else if(cell.getCellType() == Cell.CELL_TYPE_BLANK){
+ } else if(cell.getCellType() == CellType.BLANK){
arrayString.add("");
//arrayString[i] = "";
} else { // 濡傛灉EXCEL琛ㄦ牸涓殑鏁版嵁绫诲瀷涓哄瓧绗︿覆鍨�
@@ -676,9 +678,6 @@
}
return null;
}
-
-
-
/**璇诲彇excel鏂囦欢锛屽吋瀹�2003鍜�2007
* 閫氳繃娴佽鍙朎xcel鏂囦欢
@@ -697,13 +696,21 @@
List<List<String>> list = new ArrayList<>();
Workbook book = create(new BufferedInputStream(file.getInputStream()));
+ Sheet hssfsheet;
+ Row hssfrow;
+ List<String> arrayString;
+ Cell cell;
+ short format;
+ Date d;
+ DateFormat formater;
+ HSSFDataFormatter dataFormatter;
// 閬嶅巻璇ヨ〃鏍间腑鎵�鏈夌殑宸ヤ綔琛紝i琛ㄧず宸ヤ綔琛ㄧ殑鏁伴噺 getNumberOfSheets琛ㄧず宸ヤ綔琛ㄧ殑鎬绘暟
for(int s=0;s<book.getNumberOfSheets();s++) {
- Sheet hssfsheet = book.getSheetAt(s);
+ hssfsheet = book.getSheetAt(s);
int col = 0;
// 閬嶅巻璇ヨ鎵�鏈夌殑琛�,j琛ㄧず琛屾暟 getPhysicalNumberOfRows琛岀殑鎬绘暟 鍘婚櫎鏍囬
for (int j = 0; j < hssfsheet.getPhysicalNumberOfRows(); j++) {
- Row hssfrow = hssfsheet.getRow(j);
+ hssfrow = hssfsheet.getRow(j);
if(hssfrow!=null){
if(j == 0) {
col = hssfrow.getPhysicalNumberOfCells();
@@ -713,43 +720,43 @@
}
}
// 鍗曡鏁版嵁
- List<String> arrayString = new ArrayList<>();
+ arrayString = new ArrayList<>();
for (int i = 0; i < col; i++) {
- Cell cell = hssfrow.getCell(i);
+ cell = hssfrow.getCell(i);
if (cell == null) {
arrayString.add("");
- } else if (cell.getCellType() == 0) {
+ } else if (cell.getCellType() == CellType.NUMERIC) {
// arrayString[i] = new Double(cell.getNumericCellValue()).toString();
- if (HSSFCell.CELL_TYPE_NUMERIC == cell.getCellType()) {
- short format = cell.getCellStyle().getDataFormat();
+ if (CellType.NUMERIC == cell.getCellType()) {
+ 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");
+ d = cell.getDateCellValue();
+ 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();
+ d = cell.getDateCellValue();
//DateFormat formater = new SimpleDateFormat("yyyy骞碝M鏈坉d鏃� HH鏃秏m鍒唖s绉�");
- DateFormat formater = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+ 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()){
+ if(CellType.STRING == cell.getCellType()){
arrayString.add(cell.getStringCellValue());
//arrayString[i] =cell.getStringCellValue();
- }else if(HSSFCell.CELL_TYPE_FORMULA==cell.getCellType()){
+ }else if(CellType.FORMULA==cell.getCellType()){
arrayString.add(cell.getCellFormula());
//arrayString[i] =cell.getCellFormula();
- }else if(HSSFCell.CELL_TYPE_NUMERIC== cell.getCellType()){
- HSSFDataFormatter dataFormatter = new HSSFDataFormatter();
+ }else if(CellType.NUMERIC== cell.getCellType()){
+ dataFormatter = new HSSFDataFormatter();
arrayString.add(dataFormatter.formatCellValue(cell));
//arrayString[i] =dataFormatter.formatCellValue(cell);
}
}
}
- } else if(cell.getCellType() == Cell.CELL_TYPE_BLANK){
+ } else if(cell.getCellType() == CellType.BLANK){
arrayString.add("");
//arrayString[i] = "";
} else { // 濡傛灉EXCEL琛ㄦ牸涓殑鏁版嵁绫诲瀷涓哄瓧绗︿覆鍨�
@@ -773,27 +780,27 @@
* @return
* @throws Exception
*/
- public static List<List<String>> getExcelDataCompatibleCheckEmpty(File file,boolean header) throws Exception {
+ public static List<List<String>> getExcelDataCompatible(InputStream inputStream,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)));
+ Workbook book = create(new BufferedInputStream(inputStream));
+ Sheet hssfsheet;
+ Row hssfrow;
+ List<String> arrayString;
+ Cell cell;
+ short format;
+ Date d;
+ DateFormat formater;
+ HSSFDataFormatter dataFormatter;
// 閬嶅巻璇ヨ〃鏍间腑鎵�鏈夌殑宸ヤ綔琛紝i琛ㄧず宸ヤ綔琛ㄧ殑鏁伴噺 getNumberOfSheets琛ㄧず宸ヤ綔琛ㄧ殑鎬绘暟
- //涓嶄负绌�
- boolean isNotEmpty = false;
for(int s=0;s<book.getNumberOfSheets();s++) {
- Sheet hssfsheet = book.getSheetAt(s);
+ hssfsheet = book.getSheetAt(s);
int col = 0;
// 閬嶅巻璇ヨ鎵�鏈夌殑琛�,j琛ㄧず琛屾暟 getPhysicalNumberOfRows琛岀殑鎬绘暟 鍘婚櫎鏍囬
for (int j = 0; j < hssfsheet.getPhysicalNumberOfRows(); j++) {
- Row hssfrow = hssfsheet.getRow(j);
+ hssfrow = hssfsheet.getRow(j);
if(hssfrow!=null){
if(j == 0) {
col = hssfrow.getPhysicalNumberOfCells();
@@ -803,55 +810,51 @@
}
}
// 鍗曡鏁版嵁
- List<String> arrayString = new ArrayList<>();
+ arrayString = new ArrayList<>();
for (int i = 0; i < col; i++) {
- Cell cell = hssfrow.getCell(i);
+ cell = hssfrow.getCell(i);
if (cell == null) {
arrayString.add("");
- } else if (cell.getCellType() == 0) {
+ } else if (cell.getCellType() == CellType.NUMERIC) {
// arrayString[i] = new Double(cell.getNumericCellValue()).toString();
- if (HSSFCell.CELL_TYPE_NUMERIC == cell.getCellType()) {
- short format = cell.getCellStyle().getDataFormat();
+ if (CellType.NUMERIC == cell.getCellType()) {
+ 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");
+ d = cell.getDateCellValue();
+ 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();
+ d = cell.getDateCellValue();
//DateFormat formater = new SimpleDateFormat("yyyy骞碝M鏈坉d鏃� HH鏃秏m鍒唖s绉�");
- DateFormat formater = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+ 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()){
+ if(CellType.STRING == cell.getCellType()){
arrayString.add(cell.getStringCellValue());
//arrayString[i] =cell.getStringCellValue();
- }else if(HSSFCell.CELL_TYPE_FORMULA==cell.getCellType()){
+ }else if(CellType.FORMULA==cell.getCellType()){
arrayString.add(cell.getCellFormula());
//arrayString[i] =cell.getCellFormula();
- }else if(HSSFCell.CELL_TYPE_NUMERIC== cell.getCellType()){
- HSSFDataFormatter dataFormatter = new HSSFDataFormatter();
+ }else if(CellType.NUMERIC== cell.getCellType()){
+ dataFormatter = new HSSFDataFormatter();
arrayString.add(dataFormatter.formatCellValue(cell));
//arrayString[i] =dataFormatter.formatCellValue(cell);
}
}
}
- isNotEmpty = true;
- } else if(cell.getCellType() == Cell.CELL_TYPE_BLANK){
+ } else if(cell.getCellType() == CellType.BLANK){
arrayString.add("");
//arrayString[i] = "";
} else { // 濡傛灉EXCEL琛ㄦ牸涓殑鏁版嵁绫诲瀷涓哄瓧绗︿覆鍨�
arrayString.add(cell.getStringCellValue().trim());
//arrayString[i] = cell.getStringCellValue().trim();
- isNotEmpty = true;
}
}
- if (isNotEmpty){
- list.add(arrayString);
- }
+ list.add(arrayString);
}
}
}
@@ -862,135 +865,165 @@
return null;
}
-
- /**璇诲彇excel鏂囦欢锛屽吋瀹�2003鍜�2007
- * 閫氳繃娴佽鍙朎xcel鏂囦欢
- * @return
- * @throws Exception
+ /**
+ * 鏂扮増璇诲彇Excel锛屽彧鏀寔2007浠ヤ笂鐗堟湰锛屼篃灏辨槸xslx鏍煎紡
+ * 鏀寔澶ф暟鎹噺
+ * @param file 鏂囦欢
+ * @return 鏁版嵁
*/
- public static List<List<String>> getExcelDataCompatibleCheckEmpty(MultipartFile file,boolean header) throws Exception {
- try {
+ public static List<List<String>> readExcelData(File file){
+ if(!isExcel(file)){
+ throw new TipsException("璇蜂笂浼爀xcel鐨勬枃浠舵牸寮忥紒");
+ }
+ List<List<String>> listData = new ArrayList<>();
+ try{
+ //rowCacheSize 缂撳瓨鍒板唴瀛樹腑鐨勮鏁�(榛樿鏄�10)
+ //bufferSize 璇诲彇璧勬簮鏃讹紝缂撳瓨鍒板唴瀛樼殑瀛楄妭澶у皬(榛樿鏄�1024)
+ //open InputStream鎴栬�匵LSX鏍煎紡鐨凢ile(蹇呴』)
+ Workbook book = StreamingReader.builder()
+ .rowCacheSize(100)
+ .bufferSize(10240)
+ .open(new FileInputStream(file));
+ listData =readhandle(book);
+ }catch (OLE2NotOfficeXmlFileException ex){
+ ex.printStackTrace();
+ throw new RuntimeException("excel鐗堟湰涓嶄负2007鍙婁互涓�");
+ } catch (Exception e){
+ e.printStackTrace();
+ throw new RuntimeException(e.getMessage());
+ }
+ return listData;
+ }
- String fileName = file.getOriginalFilename();
- if (!fileName.matches("^.+\\.(?i)(xls)$") && !fileName.matches("^.+\\.(?i)(xlsx)$")) {
- throw new TipsException("涓婁紶鏂囦欢鏍煎紡涓嶆纭�");
- }
+ /**
+ * 鏂扮増璇诲彇Excel锛屽彧鏀寔2007浠ヤ笂鐗堟湰锛屼篃灏辨槸xslx鏍煎紡
+ * 鏀寔澶ф暟鎹噺
+ * @param file 鏂囦欢
+ * @return 鏁版嵁
+ */
+ public static List<List<String>> readExcelData(MultipartFile file){
+ if(!isExcel(file)){
+ throw new TipsException("璇蜂笂浼爀xcel鐨勬枃浠舵牸寮忥紒");
+ }
+ List<List<String>> listData = new ArrayList<>();
+ try{
+ //rowCacheSize 缂撳瓨鍒板唴瀛樹腑鐨勮鏁�(榛樿鏄�10)
+ //bufferSize 璇诲彇璧勬簮鏃讹紝缂撳瓨鍒板唴瀛樼殑瀛楄妭澶у皬(榛樿鏄�1024)
+ //open InputStream鎴栬�匵LSX鏍煎紡鐨凢ile(蹇呴』)
+ Workbook book = StreamingReader.builder()
+ .rowCacheSize(100)
+ .bufferSize(10240)
+ .open(new BufferedInputStream(file.getInputStream()));
- // 缁撴灉闆�
- List<List<String>> list = new ArrayList<>();
- Workbook book = create(new BufferedInputStream(file.getInputStream()));
+ listData =readhandle(book);
+ }catch (OLE2NotOfficeXmlFileException ex){
+ ex.printStackTrace();
+ throw new RuntimeException("excel鐗堟湰涓嶄负2007鍙婁互涓�");
+ } catch (Exception e){
+ e.printStackTrace();
+ throw new RuntimeException(e.getMessage());
+ }
+ return listData;
+ }
- // 閬嶅巻璇ヨ〃鏍间腑鎵�鏈夌殑宸ヤ綔琛紝i琛ㄧず宸ヤ綔琛ㄧ殑鏁伴噺 getNumberOfSheets琛ㄧず宸ヤ綔琛ㄧ殑鎬绘暟
- //涓嶄负绌�
- boolean isNotEmpty = false;
- 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++) {
- isNotEmpty = false;
- 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);
- }
- }
+ /**
+ * 鏂扮増璇诲彇Excel锛屽彧鏀寔2007浠ヤ笂鐗堟湰锛屼篃灏辨槸xslx鏍煎紡
+ * 鏀寔澶ф暟鎹噺
+ * @param file 鏂囦欢
+ * @return 鏁版嵁
+ */
+ public static List<List<String>> readExcelData(InputStream file){
+ List<List<String>> listData = new ArrayList<>();
+ try{
+ //rowCacheSize 缂撳瓨鍒板唴瀛樹腑鐨勮鏁�(榛樿鏄�10)
+ //bufferSize 璇诲彇璧勬簮鏃讹紝缂撳瓨鍒板唴瀛樼殑瀛楄妭澶у皬(榛樿鏄�1024)
+ //open InputStream鎴栬�匵LSX鏍煎紡鐨凢ile(蹇呴』)
+ Workbook book = StreamingReader.builder()
+ .rowCacheSize(100)
+ .bufferSize(10240)
+ .open(file);
+
+ listData =readhandle(book);
+ }catch (OLE2NotOfficeXmlFileException ex){
+ ex.printStackTrace();
+ throw new RuntimeException("excel鐗堟湰涓嶄负2007鍙婁互涓�");
+ }catch (Exception e){
+ e.printStackTrace();
+ throw new RuntimeException(e.getMessage());
+ }
+ return listData;
+ }
+
+ /**澶勭悊鏁版嵁*/
+ public static List<List<String>> readhandle(Workbook book){
+ List<List<String>> listData = new ArrayList<>();
+
+ //鏄惁瀛樺湪鏁版嵁
+ boolean isData;
+ List<String> arrayString;
+ short format;
+ Date d;
+ DateFormat formater;
+ Sheet sheet;
+ Cell cell;
+ //閬嶅巻鎵�鏈夌殑sheet
+ for(int i=0;i<book.getNumberOfSheets();i++) {
+ sheet = book.getSheetAt(i);
+ //鍒楁暟
+ Integer arrange = null;
+ //閬嶅巻鎵�鏈夌殑琛�
+ for (Row row : sheet) {
+ if(row == null){
+ continue;
+ }
+ isData = false;
+ arrayString = new ArrayList<>();
+ if(arrange == null){
+ arrange = row.getPhysicalNumberOfCells();
+ }
+ //閬嶅巻鎵�鏈夌殑鍒�
+ for (int j = 0;j<arrange;j++) {
+ cell = row.getCell(j);
+ if (cell == null) {
+ arrayString.add("");
+ }else{
+ if (cell.getCellType() == CellType.NUMERIC) {
+ isData = true;
+ format = cell.getCellStyle().getDataFormat();
+ if (format == 14 || format == 31 || format == 57 || format == 58) {
+ //鏃ユ湡锛堜腑鏂囨椂闂存牸寮忕殑锛�
+ d = cell.getDateCellValue();
+ formater = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+ arrayString.add(formater.format(d));
+ } else if (HSSFDateUtil.isCellDateFormatted(cell)) {
+ d = cell.getDateCellValue();
+ formater = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+ arrayString.add(formater.format(d));
+ } else {
+ if (CellType.STRING == cell.getCellType()) {
+ arrayString.add(cell.getStringCellValue());
+ } else if (CellType.FORMULA == cell.getCellType()) {
+ arrayString.add(cell.getCellFormula());
+ } else {
+ arrayString.add(cell.getStringCellValue().trim());
}
- isNotEmpty = true;
- } else if(cell.getCellType() == Cell.CELL_TYPE_BLANK){
- arrayString.add("");
- //arrayString[i] = "";
- } else { // 濡傛灉EXCEL琛ㄦ牸涓殑鏁版嵁绫诲瀷涓哄瓧绗︿覆鍨�
- arrayString.add(cell.getStringCellValue().trim());
- isNotEmpty = true;
- //arrayString[i] = cell.getStringCellValue().trim();
}
- }
- if (isNotEmpty){
- list.add(arrayString);
+ } else if (cell.getCellType() == CellType.BLANK) {
+ arrayString.add("");
+ } else { // 濡傛灉EXCEL琛ㄦ牸涓殑鏁版嵁绫诲瀷涓哄瓧绗︿覆鍨�
+ isData = true;
+ arrayString.add(cell.getStringCellValue().trim());
}
}
}
- }
- 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();
+ if (isData) {
+ listData.add(arrayString);
}
- 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 "";
+ return listData;
}
+
/**
* p鍒ゆ柇鏄惁excel鏂囦欢
@@ -998,16 +1031,27 @@
* @return
*/
public static boolean isExcel(MultipartFile file){
- String fileName = file.getOriginalFilename();
+ return isExcel(file.getOriginalFilename());
+ }
+
+
+ /**
+ * p鍒ゆ柇鏄惁excel鏂囦欢
+ * @param file
+ * @return
+ */
+ public static boolean isExcel(File file){
+ return isExcel(file.getName());
+ }
+
+
+ /**鍒ゆ柇鏂囦欢鏍煎紡鏄笉鏄痚xcel*/
+ public static boolean isExcel(String fileName){
if (!fileName.matches("^.+\\.(?i)(xls)$") && !fileName.matches("^.+\\.(?i)(xlsx)$")) {
return false;
}
return true;
}
-
-
-
-
public static File createExcelByImg(String[] headList, String[] fieldList, List<Map<String, Object>> dataList, Integer height, Integer width) throws Exception {
File file = File.createTempFile("temp", ".xls");
@@ -1026,8 +1070,8 @@
HSSFWorkbook workbook = new HSSFWorkbook();
HSSFCellStyle boderStyle = workbook.createCellStyle();
- boderStyle.setVerticalAlignment((short)1);
- boderStyle.setAlignment((short)2);
+ boderStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+ boderStyle.setAlignment(HorizontalAlignment.CENTER);
HSSFSheet sheet = workbook.createSheet();
HSSFPatriarch patriarch = sheet.createDrawingPatriarch();
HSSFRow row = sheet.createRow(0);
@@ -1037,7 +1081,6 @@
row.setHeight(height.shortValue());
sheet.setColumnWidth(i, width);
anchor = row.createCell(i);
- anchor.setCellType(1);
anchor.setCellValue(headList[i]);
anchor.setCellStyle(boderStyle);
}
@@ -1054,7 +1097,6 @@
for(int i = 0; i < fieldList.length; ++i) {
sheet.setColumnWidth(i, width);
cell = row_value.createCell(i);
- cell.setCellType(1);
Object value = dataMap.get(fieldList[i]);
if (value != null && "class java.io.File".equals(value.getClass().toString())) {
File file2 = (File)value;
@@ -1064,7 +1106,7 @@
bufferImg = ImageIO.read(file2);
ImageIO.write(bufferImg, "jpg", byteArrayOut);
HSSFClientAnchor anchor1 = new HSSFClientAnchor(0, 0, 1023, 255, (short)i, n + 1, (short)i, n + 1);
- anchor1.setAnchorType(0);
+ anchor1.setAnchorType(ClientAnchor.AnchorType.MOVE_AND_RESIZE);
patriarch.createPicture(anchor1, workbook.addPicture(byteArrayOut.toByteArray(), 5));
}
} else {
@@ -1087,4 +1129,5 @@
return file;
}
+
}
\ No newline at end of file
--
Gitblit v1.8.0