center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests 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
Show Stats 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);
}
}

3
backend/src/main/resources/i18n/messages_en_US.properties
View File

@ -252,4 +252,5 @@ i18n_id_or_pwd_error=Invalid ID or password
i18n_datasource_delete=Data source is delete
i18n_dataset_delete=Data set is delete
i18n_chart_delete=Chart is delete
i18n_not_exec_add_sync=There is no completed synchronization task. Incremental synchronization cannot be performed
i18n_not_exec_add_sync=There is no completed synchronization task. Incremental synchronization cannot be performed
i18n_excel_header_empty=Excel first row can not empty

1
backend/src/main/resources/i18n/messages_zh_CN.properties
View File

@ -253,3 +253,4 @@ i18n_datasource_delete=当前用到的数据源已被删除
i18n_dataset_delete=当前用到的数据集已被删除
i18n_chart_delete=当前用到的视图已被删除
i18n_not_exec_add_sync=没有已完成的同步任务，无法进行增量同步
i18n_excel_header_empty=Excel第一行为空

3
backend/src/main/resources/i18n/messages_zh_TW.properties
View File

@ -254,4 +254,5 @@ i18n_id_or_pwd_error=無效的ID或密碼
i18n_datasource_delete=當前用到的數據源已被刪除
i18n_dataset_delete=當前用到的數據集已被刪除
i18n_chart_delete=當前用到的視圖已被刪除
i18n_not_exec_add_sync=沒有已經完成的同步任務，無法進行增量同步
i18n_not_exec_add_sync=沒有已經完成的同步任務，無法進行增量同步
i18n_excel_header_empty=Excel第一行為空