dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7878 from dataease/pr@dev@fixexcel

Browse Source 
fix(数据集):  修复上传Excel失败
This commit is contained in:
taojinlong 2024-01-29 16:03:51 +08:00 committed by GitHub
commit 82a5965832
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1060,7 +1060,7 @@ public class ExtractDataService {
udjcStep = udjc(datasetTableFields, DatasourceTypes.db2, db2Configuration, isSetKey); udjcStep = udjc(datasetTableFields, DatasourceTypes.db2, db2Configuration, isSetKey);
break; break;
case excel: case excel:
inputSteps = excelInputStep(datasetTable.getInfo(), datasetTableFields); inputSteps = excelInputStep(datasetTable.getInfo(), datasetTableFields, isSetKey);
udjcStep = udjc(datasetTableFields, DatasourceTypes.excel, null, isSetKey); udjcStep = udjc(datasetTableFields, DatasourceTypes.excel, null, isSetKey);
default: default:
break; break;
@ -1147,7 +1147,7 @@ public class ExtractDataService {
return inputSteps; return inputSteps;
} }
private List<StepMeta> excelInputStep(String Info, List<DatasetTableField> datasetTableFields) { private List<StepMeta> excelInputStep(String Info, List<DatasetTableField> datasetTableFields, boolean isSetKey) {
List<StepMeta> inputSteps = new ArrayList<>(); List<StepMeta> inputSteps = new ArrayList<>();
DataTableInfoDTO dataTableInfoDTO = new Gson().fromJson(Info, DataTableInfoDTO.class); DataTableInfoDTO dataTableInfoDTO = new Gson().fromJson(Info, DataTableInfoDTO.class);
List<ExcelSheetData> excelSheetDataList = dataTableInfoDTO.getExcelSheetDataList(); List<ExcelSheetData> excelSheetDataList = dataTableInfoDTO.getExcelSheetDataList();
@ -1165,8 +1165,13 @@ public class ExtractDataService {
csvInputMeta.setHeaderPresent(true); csvInputMeta.setHeaderPresent(true);
csvInputMeta.setBufferSize("10000"); csvInputMeta.setBufferSize("10000");
csvInputMeta.setDelimiter(","); csvInputMeta.setDelimiter(",");
TextFileInputField[] fields = new TextFileInputField[datasetTableFields.size()]; Integer fileInputFields = isSetKey ? datasetTableFields.size() : datasetTableFields.size() - 1;
TextFileInputField[] fields = new TextFileInputField[fileInputFields];
for (int i = 0; i < datasetTableFields.size(); i++) { for (int i = 0; i < datasetTableFields.size(); i++) {
if(datasetTableFields.get(i).getDataeaseName().equalsIgnoreCase("dataease_uuid")){
continue;
}
TextFileInputField field = new TextFileInputField(); TextFileInputField field = new TextFileInputField();
field.setName(datasetTableFields.get(i).getDataeaseName()); field.setName(datasetTableFields.get(i).getDataeaseName());
if (datasetTableFields.get(i).getDeExtractType() == 1) { if (datasetTableFields.get(i).getDeExtractType() == 1) {