From 98acbb10d364d62a3530a9f890613787095ece98 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 22 Nov 2022 14:00:11 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20Excel=E7=A9=BA=E5=8D=95=E5=85=83?= =?UTF-8?q?=E6=A0=BC=E4=B8=8D=E5=8F=82=E4=B8=8E=E7=B1=BB=E5=9E=8B=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/utils/ExcelXlsReader.java | 53 ++++---- .../commons/utils/ExcelXlsxReader.java | 114 ++++++++++-------- 2 files changed, 87 insertions(+), 80 deletions(-) diff --git a/backend/src/main/java/io/dataease/commons/utils/ExcelXlsReader.java b/backend/src/main/java/io/dataease/commons/utils/ExcelXlsReader.java index f998cfa398..59744d8384 100644 --- a/backend/src/main/java/io/dataease/commons/utils/ExcelXlsReader.java +++ b/backend/src/main/java/io/dataease/commons/utils/ExcelXlsReader.java @@ -125,12 +125,11 @@ public class ExcelXlsReader implements HSSFListener { return data; } - public void setData(List> data) { + public void setData(List> data) { this.data = data; } - /** * 遍历excel下所有的sheet * @@ -212,8 +211,8 @@ public class ExcelXlsReader implements HSSFListener { thisColumn = frec.getColumn(); thisStr = String.valueOf(frec.getValue()); String fieldType = checkType(thisStr, thisColumn); - if(fieldType.equalsIgnoreCase("LONG") && thisStr.endsWith(".0")){ - thisStr = thisStr.substring(0, thisStr.length() -2); + if (fieldType != null && fieldType.equalsIgnoreCase("LONG") && thisStr.endsWith(".0")) { + thisStr = thisStr.substring(0, thisStr.length() - 2); } cellList.add(thisColumn, thisStr); checkRowIsNull(thisStr); //如果里面某个单元格含有值，则标识该行不为空行 @@ -268,9 +267,9 @@ public class ExcelXlsReader implements HSSFListener { value = value.equals("") ? "" : value; //向容器加入列值 cellList.add(thisColumn, value); - if(formatIndex == 59 || formatIndex== 14){ - totalSheets.get(totalSheets.size() -1).getFields().get(thisColumn).setFieldType("DATETIME"); - }else { + if (formatIndex == 59 || formatIndex == 14) { + totalSheets.get(totalSheets.size() - 1).getFields().get(thisColumn).setFieldType("DATETIME"); + } else { checkType(value, thisColumn); } checkRowIsNull(value); //如果里面某个单元格含有值，则标识该行不为空行 @@ -308,7 +307,7 @@ public class ExcelXlsReader implements HSSFListener { } lastColumnNumber = -1; - if(!totalSheets.stream().map(ExcelSheetData::getExcelLabel).collect(Collectors.toList()).contains(sheetName)){ + if (!totalSheets.stream().map(ExcelSheetData::getExcelLabel).collect(Collectors.toList()).contains(sheetName)) { ExcelSheetData excelSheetData = new ExcelSheetData(); excelSheetData.setExcelLabel(sheetName); excelSheetData.setData(new ArrayList<>()); @@ -316,7 +315,7 @@ public class ExcelXlsReader implements HSSFListener { totalSheets.add(excelSheetData); } - if(curRow == 0){ + if (curRow == 0) { for (String s : cellList) { TableField tableField = new TableField(); tableField.setFieldType("TEXT"); @@ -324,13 +323,13 @@ public class ExcelXlsReader implements HSSFListener { tableField.setFieldName(s); tableField.setRemarks(s); this.fields.add(tableField); - totalSheets.get(totalSheets.size() -1).getFields().add(tableField); + totalSheets.get(totalSheets.size() - 1).getFields().add(tableField); } } if (flag && curRow != 0) { //该行不为空行且该行不是第一行，发送（第一行为列名，不需要） - if(!totalSheets.stream().map(ExcelSheetData::getExcelLabel).collect(Collectors.toList()).contains(sheetName)){ + if (!totalSheets.stream().map(ExcelSheetData::getExcelLabel).collect(Collectors.toList()).contains(sheetName)) { ExcelSheetData excelSheetData = new ExcelSheetData(); excelSheetData.setData(new ArrayList<>(data)); excelSheetData.setExcelLabel(sheetName); @@ -339,13 +338,13 @@ public class ExcelXlsReader implements HSSFListener { excelSheetData.getData().add(tmp); totalRows++; totalSheets.add(excelSheetData); - }else { + } else { List tmp = new ArrayList<>(cellList); - if(obtainedNum != null && totalSheets.stream().filter(s->s.getExcelLabel().equalsIgnoreCase(sheetName)).collect(Collectors.toList()).get(0).getData().size() < obtainedNum){ - totalSheets.stream().filter(s->s.getExcelLabel().equalsIgnoreCase(sheetName)).collect(Collectors.toList()).get(0).getData().add(tmp); + if (obtainedNum != null && totalSheets.stream().filter(s -> s.getExcelLabel().equalsIgnoreCase(sheetName)).collect(Collectors.toList()).get(0).getData().size() < obtainedNum) { + totalSheets.stream().filter(s -> s.getExcelLabel().equalsIgnoreCase(sheetName)).collect(Collectors.toList()).get(0).getData().add(tmp); } - if(obtainedNum == null){ - totalSheets.stream().filter(s->s.getExcelLabel().equalsIgnoreCase(sheetName)).collect(Collectors.toList()).get(0).getData().add(tmp); + if (obtainedNum == null) { + totalSheets.stream().filter(s -> s.getExcelLabel().equalsIgnoreCase(sheetName)).collect(Collectors.toList()).get(0).getData().add(tmp); } totalRows++; } @@ -369,7 +368,7 @@ public class ExcelXlsReader implements HSSFListener { } - private String checkType(String str, int thisColumn){ + private String checkType(String str, int thisColumn) { String type = null; try { double d = Double.valueOf(str); @@ -382,22 +381,20 @@ public class ExcelXlsReader implements HSSFListener { type = "DOUBLE"; } } catch (Exception e) { - type = "TEXT"; } - }catch (Exception e){ - type = "TEXT"; + } catch (Exception e) { } - if(curRow==1){ - totalSheets.get(totalSheets.size() -1).getFields().get(thisColumn).setFieldType(type); + if (curRow == 1) { + totalSheets.get(totalSheets.size() - 1).getFields().get(thisColumn).setFieldType(type == null ? "TEXT" : type); } - if(curRow > 1) { - String oldType = totalSheets.get(totalSheets.size() -1).getFields().get(thisColumn).getFieldType(); - if(type.equalsIgnoreCase("TEXT")){ - totalSheets.get(totalSheets.size() -1).getFields().get(thisColumn).setFieldType(type); + if (curRow > 1 && type != null) { + String oldType = totalSheets.get(totalSheets.size() - 1).getFields().get(thisColumn).getFieldType(); + if (type.equalsIgnoreCase("TEXT")) { + totalSheets.get(totalSheets.size() - 1).getFields().get(thisColumn).setFieldType(type); } - if(type.equalsIgnoreCase("DOUBLE") && oldType.equalsIgnoreCase("LONG")){ - totalSheets.get(totalSheets.size() -1).getFields().get(thisColumn).setFieldType(type); + if (type.equalsIgnoreCase("DOUBLE") && oldType.equalsIgnoreCase("LONG")) { + totalSheets.get(totalSheets.size() - 1).getFields().get(thisColumn).setFieldType(type); } } return type; diff --git a/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java b/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java index 1d7be1dc7d..d144b05d7d 100644 --- a/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java +++ b/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java @@ -1,4 +1,5 @@ package io.dataease.commons.utils; + import io.dataease.dto.dataset.ExcelSheetData; import io.dataease.i18n.Translator; import io.dataease.plugins.common.dto.datasource.TableField; @@ -35,7 +36,8 @@ public class ExcelXlsxReader extends DefaultHandler { /** * 自定义获取表格某些信 */ - public Map map = new TreeMap(); + public Map map = new TreeMap(); + /** * 单元格中的数据可能的数据类型 */ @@ -56,7 +58,7 @@ public class ExcelXlsxReader extends DefaultHandler { /** * 总行数 */ - private int totalRows=0; + private int totalRows = 0; /** * 一行内cell集合 @@ -101,7 +103,6 @@ public class ExcelXlsxReader extends DefaultHandler { private String formatString; - //定义前一个元素和当前元素的位置，用来计算其中空的单元格数量，如A6和A8等 private String preRef = null, ref = null; @@ -143,7 +144,7 @@ public class ExcelXlsxReader extends DefaultHandler { return data; } - public void setData(List> data) { + public void setData(List> data) { this.data = data; } @@ -190,11 +191,11 @@ public class ExcelXlsxReader extends DefaultHandler { */ @Override public void startElement(String uri, String localName, String name, Attributes attributes) throws SAXException { - if(this.obtainedNum !=null && curRow>this.obtainedNum){ + if (this.obtainedNum != null && curRow > this.obtainedNum) { return; } - if(name.equalsIgnoreCase("mergeCell")){ + if (name.equalsIgnoreCase("mergeCell")) { throw new RuntimeException(Translator.get("i18n_excel_have_merge_region")); } //c => 单元格 @@ -221,6 +222,7 @@ public class ExcelXlsxReader extends DefaultHandler { * 得到单元格对应的索引值或是内容值 * 如果单元格类型是字符串、INLINESTR、数字、日期，lastIndex则是索引值 * 如果单元格类型是布尔值、错误、公式，lastIndex则是内容值 + * * @param ch * @param start * @param length @@ -228,7 +230,7 @@ public class ExcelXlsxReader extends DefaultHandler { */ @Override public void characters(char[] ch, int start, int length) throws SAXException { - if(this.obtainedNum !=null && curRow>this.obtainedNum){ + if (this.obtainedNum != null && curRow > this.obtainedNum) { return; } lastIndex += new String(ch, start, length); @@ -244,14 +246,14 @@ public class ExcelXlsxReader extends DefaultHandler { */ @Override public void endElement(String uri, String localName, String name) throws SAXException { - if(this.obtainedNum !=null && curRow>this.obtainedNum){ + if (this.obtainedNum != null && curRow > this.obtainedNum) { return; } //t元素也包含字符串 if (isTElement) { //这个程序没经过 //将单元格内容加入rowlist中，在这之前先去掉字符串前后的空白符 String value = lastIndex.trim(); - if(curRow==1){ + if (curRow == 1) { TableField tableField = new TableField(); tableField.setFieldType("TEXT"); tableField.setFieldSize(65533); @@ -271,21 +273,21 @@ public class ExcelXlsxReader extends DefaultHandler { String value = this.getDataValue(lastIndex.trim(), "");//根据索引值获取对应的单元格值 if (preRef == null) { preRef = "A" + curRow; - if(!preRef.equalsIgnoreCase(ref)){ + if (!preRef.equalsIgnoreCase(ref)) { cellList.add(curCol, ""); curCol++; } } //补全单元格之间的空单元格 - if (!"A".equals(preRef.substring(0, 1)) && curRow==1 && preRef.equalsIgnoreCase(ref)) { + if (!"A".equals(preRef.substring(0, 1)) && curRow == 1 && preRef.equalsIgnoreCase(ref)) { throw new RuntimeException(Translator.get("i18n_excel_empty_column")); - }else if (!ref.equals(preRef)) { + } else if (!ref.equals(preRef)) { int len = countNullCell(ref, preRef); for (int i = 0; i < len; i++) { - if(curCol < this.fields.size()){ + if (curCol < this.fields.size()) { cellList.add(curCol, ""); - if(curRow==1){ + if (curRow == 1) { addField("", curCol); } curCol++; @@ -293,7 +295,7 @@ public class ExcelXlsxReader extends DefaultHandler { } } - if(curCol < this.fields.size()){ + if (curCol < this.fields.size()) { cellList.add(curCol, value); } curCol++; @@ -309,8 +311,8 @@ public class ExcelXlsxReader extends DefaultHandler { if (curRow == 1) { maxRef = ref; } - if(curRow>1){ - for (int i=cellList.size();i 1) { + for (int i = cellList.size(); i < this.fields.size(); i++) { cellList.add(""); } List tmp = new ArrayList<>(cellList); @@ -322,7 +324,7 @@ public class ExcelXlsxReader extends DefaultHandler { curCol = 0; preRef = null; ref = null; - flag=false; + flag = false; } } } @@ -357,9 +359,8 @@ public class ExcelXlsxReader extends DefaultHandler { formatIndex = style.getDataFormat(); formatString = style.getDataFormatString(); short format = this.formatIndex; - if ( (14 <= format && format <= 17) || format == 20 || format == 22 || format == 31 || format == 35 || format == 45 || format == 46 || format == 47 || (57 <= format && format <= 59) - || (175 < format && format < 178) || (182 <= format && format <= 196) || (210 <= format && format <= 213) || (208 == format)) - { // 日期 + if ((14 <= format && format <= 17) || format == 20 || format == 22 || format == 31 || format == 35 || format == 45 || format == 46 || format == 47 || (57 <= format && format <= 59) + || (175 < format && format < 178) || (182 <= format && format <= 196) || (210 <= format && format <= 213) || (208 == format)) { // 日期 isDateFormat = true; } @@ -369,6 +370,7 @@ public class ExcelXlsxReader extends DefaultHandler { /** * 对解析出来的数据进行类型处理 + * * @param value 单元格的值， * value代表解析：BOOL的为0或1， ERROR的为内容值，FORMULA的为内容值，INLINESTR的为索引值需转换为内容值， * SSTINDEX的为索引值需转换为内容值， NUMBER为内容值，DATE为内容值 @@ -377,7 +379,7 @@ public class ExcelXlsxReader extends DefaultHandler { */ @SuppressWarnings("deprecation") public String getDataValue(String value, String thisStr) { - String type = "TEXT"; + String type = null; switch (nextDataType) { // 这几个的顺序不能随便交换，交换了很可能会导致数据错误 case BOOL: //布尔值 @@ -401,11 +403,11 @@ public class ExcelXlsxReader extends DefaultHandler { String sstIndex = value.toString(); try { int idx = Integer.parseInt(sstIndex); - if(sst != null){ + if (sst != null) { XSSFRichTextString rtss = new XSSFRichTextString(sst.getEntryAt(idx));//根据idx索引值获取内容值 thisStr = rtss.toString(); rtss = null; - }else { + } else { thisStr = value.toString(); } @@ -422,12 +424,13 @@ public class ExcelXlsxReader extends DefaultHandler { } thisStr = thisStr.replace("_", "").trim(); - if(isDateFormat ){ - type = "DATETIME";isDateFormat = false; - if(formatString != null && formatString.contains("%")){ + if (isDateFormat) { + type = "DATETIME"; + isDateFormat = false; + if (formatString != null && formatString.contains("%")) { type = getType(thisStr); } - }else { + } else { type = getType(thisStr); } break; @@ -441,60 +444,67 @@ public class ExcelXlsxReader extends DefaultHandler { thisStr = " "; break; } - if(curRow==1){ + if (curRow == 1) { addField(thisStr, null); - }else { - if(CollectionUtils.isEmpty(this.getFields())){ + } else { + if (CollectionUtils.isEmpty(this.getFields())) { throw new RuntimeException(Translator.get("i18n_excel_header_empty")); } - if(curCol >= this.fields.size()){ + if (curCol >= this.fields.size()) { return thisStr; } - if(curRow==2){ - this.getFields().get(curCol).setFieldType(type); - }else { - if(type.equalsIgnoreCase("TEXT")){ + if (curRow == 2) { + if (type != null) { this.getFields().get(curCol).setFieldType(type); } - if(type.equalsIgnoreCase("DOUBLE") && this.getFields().get(curCol).getFieldType().equalsIgnoreCase("LONG")){ - this.getFields().get(curCol).setFieldType(type); - } - if(type.equalsIgnoreCase("DATETIME")){ - this.getFields().get(curCol).setFieldType(type); + } else { + if (type != null) { + if (type.equalsIgnoreCase("TEXT")) { + this.getFields().get(curCol).setFieldType(type); + } + if (type.equalsIgnoreCase("DOUBLE") && this.getFields().get(curCol).getFieldType().equalsIgnoreCase("LONG")) { + this.getFields().get(curCol).setFieldType(type); + } + if (type.equalsIgnoreCase("DATETIME")) { + this.getFields().get(curCol).setFieldType(type); + } } } } return thisStr; } - private void addField(String columeName, Integer index){ + private void addField(String columeName, Integer index) { TableField tableField = new TableField(); tableField.setFieldType("TEXT"); tableField.setFieldSize(65533); tableField.setFieldName(columeName); tableField.setRemarks(columeName); - if(index != null){ + if (index != null) { this.fields.add(index, tableField); - }else { + } else { this.fields.add(tableField); } } - private String getType(String thisStr){ - if(totalRows==0){ + + private String getType(String thisStr) { + if (totalRows == 0) { return "TEXT"; } - try{ - if(thisStr.endsWith("%")){ - thisStr = thisStr.substring(0, thisStr.length()-1); - thisStr = String.valueOf(Double.valueOf(thisStr)/100); + + try { + if (thisStr.endsWith("%")) { + thisStr = thisStr.substring(0, thisStr.length() - 1); + thisStr = String.valueOf(Double.valueOf(thisStr) / 100); } Long.valueOf(thisStr); return "LONG"; - }catch (Exception e){ + } catch (Exception e) { try { Double.valueOf(thisStr); return "DOUBLE"; - }catch (Exception ignore){ } + } catch (Exception ignore) { + } } return "TEXT"; }