center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge remote-tracking branch 'origin/main' into main

Browse Source
This commit is contained in:
junjie 2021-05-12 12:26:41 +08:00
commit 0c4b321221
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,10 +92,12 @@ public class DataSetTableService {
// 添加表成功后，获取当前表字段和类型，抽象到dataease数据库 // 添加表成功后，获取当前表字段和类型，抽象到dataease数据库
if (insert == 1) { if (insert == 1) {
saveTableField(datasetTable); saveTableField(datasetTable);
if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "excel")) {
commonThreadPool.addTask(() -> { commonThreadPool.addTask(() -> {
extractDataService.extractData(datasetTable.getId(), null, "all_scope"); extractDataService.extractData(datasetTable.getId(), null, "all_scope");
}); });
} }
}
} else { } else {
int update = datasetTableMapper.updateByPrimaryKeySelective(datasetTable); int update = datasetTableMapper.updateByPrimaryKeySelective(datasetTable);
// sql 更新 // sql 更新

1
backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
View File

@ -494,6 +494,7 @@ public class ExtractDataService {
excelInputMeta.setPassword("Encrypted"); excelInputMeta.setPassword("Encrypted");
excelInputMeta.setFileName(new String[]{filePath}); excelInputMeta.setFileName(new String[]{filePath});
excelInputMeta.setStartsWithHeader(true); excelInputMeta.setStartsWithHeader(true);
excelInputMeta.setIgnoreEmptyRows(true);
ExcelInputField[] fields = new ExcelInputField[datasetTableFields.size()]; ExcelInputField[] fields = new ExcelInputField[datasetTableFields.size()];
for (int i=0; i<datasetTableFields.size();i++) { for (int i=0; i<datasetTableFields.size();i++) {
ExcelInputField field = new ExcelInputField(); ExcelInputField field = new ExcelInputField();