diff --git a/backend/src/main/java/io/dataease/job/sechedule/Schedular.java b/backend/src/main/java/io/dataease/job/sechedule/Schedular.java index cf02018217..9d4319faac 100644 --- a/backend/src/main/java/io/dataease/job/sechedule/Schedular.java +++ b/backend/src/main/java/io/dataease/job/sechedule/Schedular.java @@ -3,9 +3,11 @@ package io.dataease.job.sechedule; import com.fit2cloud.quartz.anno.QuartzScheduled; import io.dataease.datasource.service.DatasourceService; import io.dataease.service.dataset.DataSetTableService; +import org.springframework.stereotype.Component; import javax.annotation.Resource; +@Component public class Schedular { @Resource private DataSetTableService dataSetTableService; diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java index e6a4df3265..06c8405f54 100644 --- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -40,7 +40,6 @@ import org.pentaho.di.job.JobMeta; import org.pentaho.di.job.entries.shell.JobEntryShell; import org.pentaho.di.job.entries.special.JobEntrySpecial; 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.repository.RepositoryDirectoryInterface; import org.pentaho.di.repository.filerep.KettleFileRepository; @@ -965,18 +964,17 @@ public class ExtractDataService { outputFields[datasetTableFields.size()] = textFileField; 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]; for(int i=0;i< datasetTableFields.size();i++){ TextFileField textFileField = new TextFileField(); textFileField.setName(datasetTableFields.get(i).getOriginName()); - if (datasetTableFields.get(i).getDeExtractType() == 1) { + if (datasetTableFields.get(i).getDeExtractType() == 2) { textFileField.setType("Integer"); textFileField.setFormat("0"); } else { textFileField.setType("String"); } - outputFields[i] = textFileField; } TextFileField textFileField = new TextFileField(); @@ -985,7 +983,7 @@ public class ExtractDataService { outputFields[datasetTableFields.size()] = textFileField; textFileOutputMeta.setOutputFields(outputFields); - }{ + }else { textFileOutputMeta.setOutputFields(new TextFileField[0]); }