github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-25 12:03:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: 尝试解决导入excle 报找不到字段的问题

Browse Source
This commit is contained in:
taojinlong 2021-08-20 17:32:13 +08:00
parent fecdd28d2d
commit 130cbb23cf
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/dataease/job/sechedule/Schedular.java
View File

@ -3,9 +3,11 @@ package io.dataease.job.sechedule;
import com.fit2cloud.quartz.anno.QuartzScheduled; import com.fit2cloud.quartz.anno.QuartzScheduled;
import io.dataease.datasource.service.DatasourceService; import io.dataease.datasource.service.DatasourceService;
import io.dataease.service.dataset.DataSetTableService; import io.dataease.service.dataset.DataSetTableService;
import org.springframework.stereotype.Component;
import javax.annotation.Resource; import javax.annotation.Resource;
@Component
public class Schedular { public class Schedular {
@Resource @Resource
private DataSetTableService dataSetTableService; private DataSetTableService dataSetTableService;

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

@ -40,7 +40,6 @@ import org.pentaho.di.job.JobMeta;
import org.pentaho.di.job.entries.shell.JobEntryShell; import org.pentaho.di.job.entries.shell.JobEntryShell;
import org.pentaho.di.job.entries.special.JobEntrySpecial; import org.pentaho.di.job.entries.special.JobEntrySpecial;
import org.pentaho.di.job.entries.success.JobEntrySuccess; import org.pentaho.di.job.entries.success.JobEntrySuccess;
import org.pentaho.di.job.entries.trans.JobEntryTrans;
import org.pentaho.di.job.entry.JobEntryCopy; import org.pentaho.di.job.entry.JobEntryCopy;
import org.pentaho.di.repository.RepositoryDirectoryInterface; import org.pentaho.di.repository.RepositoryDirectoryInterface;
import org.pentaho.di.repository.filerep.KettleFileRepository; import org.pentaho.di.repository.filerep.KettleFileRepository;
@ -965,18 +964,17 @@ public class ExtractDataService {
outputFields[datasetTableFields.size()] = textFileField; outputFields[datasetTableFields.size()] = textFileField;
textFileOutputMeta.setOutputFields(outputFields); textFileOutputMeta.setOutputFields(outputFields);
}else if(datasource.getType().equalsIgnoreCase(DatasourceTypes.excel.name())){ }else if(datasource.getType().equalsIgnoreCase(DatasourceTypes.excel.name())) {
TextFileField[] outputFields = new TextFileField[datasetTableFields.size() + 1]; TextFileField[] outputFields = new TextFileField[datasetTableFields.size() + 1];
for(int i=0;i< datasetTableFields.size();i++){ for(int i=0;i< datasetTableFields.size();i++){
TextFileField textFileField = new TextFileField(); TextFileField textFileField = new TextFileField();
textFileField.setName(datasetTableFields.get(i).getOriginName()); textFileField.setName(datasetTableFields.get(i).getOriginName());
if (datasetTableFields.get(i).getDeExtractType() == 1) { if (datasetTableFields.get(i).getDeExtractType() == 2) {
textFileField.setType("Integer"); textFileField.setType("Integer");
textFileField.setFormat("0"); textFileField.setFormat("0");
} else { } else {
textFileField.setType("String"); textFileField.setType("String");
} }
outputFields[i] = textFileField; outputFields[i] = textFileField;
} }
TextFileField textFileField = new TextFileField(); TextFileField textFileField = new TextFileField();
@ -985,7 +983,7 @@ public class ExtractDataService {
outputFields[datasetTableFields.size()] = textFileField; outputFields[datasetTableFields.size()] = textFileField;
textFileOutputMeta.setOutputFields(outputFields); textFileOutputMeta.setOutputFields(outputFields);
}{ }else {
textFileOutputMeta.setOutputFields(new TextFileField[0]); textFileOutputMeta.setOutputFields(new TextFileField[0]);
} }