public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-06-17 04:51:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(backend):excel解析优化

Browse Source
This commit is contained in:
junjie
2021-06-09 18:57:32 +08:00
parent e2d6cd240c
commit f3dadc8ffe
4 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
View File

@@ -723,6 +723,9 @@ public class DataSetTableService {
for (int i = 0; i < rows; i++) {
HSSFRow row = sheet0.getRow(i);
if (i == 0) {
if (row == null) {
throw new RuntimeException(Translator.get("i18n_excel_header_empty"));
}
columnNum = row.getPhysicalNumberOfCells();
}
String[] r = new String[columnNum];
@@ -739,8 +742,14 @@ public class DataSetTableService {
tableFiled.setRemarks(columnName);
fields.add(tableFiled);
} else if (i == 1) {
if (row == null) {
break;
}
r[j] = readCell(row.getCell(j), true, fields.get(j));
} else {
if (row == null) {
break;
}
r[j] = readCell(row.getCell(j), false, null);
}
}
@@ -767,6 +776,9 @@ public class DataSetTableService {
for (int i = 0; i < rows; i++) {
XSSFRow row = sheet0.getRow(i);
if (i == 0) {
if (row == null) {
throw new RuntimeException(Translator.get("i18n_excel_header_empty"));
}
columnNum = row.getPhysicalNumberOfCells();
}
String[] r = new String[columnNum];
@@ -783,8 +795,14 @@ public class DataSetTableService {
tableFiled.setRemarks(columnName);
fields.add(tableFiled);
} else if (i == 1) {
if (row == null) {
break;
}
r[j] = readCell(row.getCell(j), true, fields.get(j));
} else {
if (row == null) {
break;
}
r[j] = readCell(row.getCell(j), false, null);
}
}