提交 a48249c8 authored 作者: taojinlong's avatar taojinlong

fix: 预览 excel数据集时,给出提示信息:处理中/处理失败

上级 de3ec60c
...@@ -13,7 +13,6 @@ public class ExtractDataJob extends DeScheduleJob{ ...@@ -13,7 +13,6 @@ public class ExtractDataJob extends DeScheduleJob{
extractDataService = (ExtractDataService) CommonBeanFactory.getBean(ExtractDataService.class); extractDataService = (ExtractDataService) CommonBeanFactory.getBean(ExtractDataService.class);
} }
@Override @Override
void businessExecute(JobExecutionContext context) { void businessExecute(JobExecutionContext context) {
extractDataService.extractData(datasetTableId, taskId, updateType); extractDataService.extractData(datasetTableId, taskId, updateType);
......
...@@ -7,6 +7,7 @@ import io.dataease.base.mapper.DatasetTableIncrementalConfigMapper; ...@@ -7,6 +7,7 @@ import io.dataease.base.mapper.DatasetTableIncrementalConfigMapper;
import io.dataease.base.mapper.DatasetTableMapper; import io.dataease.base.mapper.DatasetTableMapper;
import io.dataease.base.mapper.DatasourceMapper; import io.dataease.base.mapper.DatasourceMapper;
import io.dataease.base.mapper.ext.ExtDataSetTableMapper; import io.dataease.base.mapper.ext.ExtDataSetTableMapper;
import io.dataease.commons.constants.JobStatus;
import io.dataease.commons.utils.*; import io.dataease.commons.utils.*;
import io.dataease.controller.request.dataset.DataSetTableRequest; import io.dataease.controller.request.dataset.DataSetTableRequest;
import io.dataease.datasource.dto.TableFiled; import io.dataease.datasource.dto.TableFiled;
...@@ -71,6 +72,8 @@ public class DataSetTableService { ...@@ -71,6 +72,8 @@ public class DataSetTableService {
private DatasetTableIncrementalConfigMapper datasetTableIncrementalConfigMapper; private DatasetTableIncrementalConfigMapper datasetTableIncrementalConfigMapper;
@Resource @Resource
private DataSetTableUnionService dataSetTableUnionService; private DataSetTableUnionService dataSetTableUnionService;
@Resource
private DataSetTableTaskLogService dataSetTableTaskLogService;
@Value("${upload.file.path}") @Value("${upload.file.path}")
private String path; private String path;
...@@ -256,6 +259,16 @@ public class DataSetTableService { ...@@ -256,6 +259,16 @@ public class DataSetTableService {
e.printStackTrace(); e.printStackTrace();
} }
} else if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "excel")) { } else if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "excel")) {
List<DatasetTableTaskLog> datasetTableTaskLogs = dataSetTableTaskLogService.getByTableId(datasetTable.getId());
if(CollectionUtils.isEmpty(datasetTableTaskLogs)){
throw new Exception("no records");
}
if(datasetTableTaskLogs.get(0).getStatus().equalsIgnoreCase(JobStatus.Underway.name())){
throw new Exception(Translator.get("i18n_processing_data"));
}
if(datasetTableTaskLogs.get(0).getStatus().equalsIgnoreCase(JobStatus.Error.name())){
throw new Exception("Failed to extract data: " + datasetTableTaskLogs.get(0).getInfo());
}
Datasource ds = (Datasource) CommonBeanFactory.getBean("DorisDatasource"); Datasource ds = (Datasource) CommonBeanFactory.getBean("DorisDatasource");
JdbcProvider jdbcProvider = CommonBeanFactory.getBean(JdbcProvider.class); JdbcProvider jdbcProvider = CommonBeanFactory.getBean(JdbcProvider.class);
DatasourceRequest datasourceRequest = new DatasourceRequest(); DatasourceRequest datasourceRequest = new DatasourceRequest();
......
...@@ -49,4 +49,10 @@ public class DataSetTableTaskLogService { ...@@ -49,4 +49,10 @@ public class DataSetTableTaskLogService {
datasetTableTaskLogMapper.deleteByExample(datasetTableTaskLogExample); datasetTableTaskLogMapper.deleteByExample(datasetTableTaskLogExample);
} }
public List<DatasetTableTaskLog> getByTableId(String datasetId){
DatasetTableTaskLogExample datasetTableTaskLogExample = new DatasetTableTaskLogExample();
DatasetTableTaskLogExample.Criteria criteria = datasetTableTaskLogExample.createCriteria();
criteria.andTableIdEqualTo(datasetId);
return datasetTableTaskLogMapper.selectByExampleWithBLOBs(datasetTableTaskLogExample);
}
} }
...@@ -235,3 +235,4 @@ i18n_cron_expression_error=Cron expression error ...@@ -235,3 +235,4 @@ i18n_cron_expression_error=Cron expression error
i18n_same_folder_can_not_repeat=Same Folder Can Not Repeat i18n_same_folder_can_not_repeat=Same Folder Can Not Repeat
i18n_default_panel=Default Panel i18n_default_panel=Default Panel
i18n_panel_list=Panel List i18n_panel_list=Panel List
i18n_processing_data=Processing data now, Refresh later
\ No newline at end of file
...@@ -236,3 +236,4 @@ i18n_cron_expression_error=Cron表达式校验错误 ...@@ -236,3 +236,4 @@ i18n_cron_expression_error=Cron表达式校验错误
i18n_same_folder_can_not_repeat=相同的目录下名称不能重复 i18n_same_folder_can_not_repeat=相同的目录下名称不能重复
i18n_default_panel=默认仪表盘 i18n_default_panel=默认仪表盘
i18n_panel_list=仪表盘列表 i18n_panel_list=仪表盘列表
i18n_processing_data=正在处理数据,稍后刷新
...@@ -236,3 +236,4 @@ i18n_cron_expression_error=Cron表達式校驗錯誤 ...@@ -236,3 +236,4 @@ i18n_cron_expression_error=Cron表達式校驗錯誤
i18n_same_folder_can_not_repeat=相同的目录下名称不能重复 i18n_same_folder_can_not_repeat=相同的目录下名称不能重复
i18n_default_panel=默认仪表盘 i18n_default_panel=默认仪表盘
i18n_panel_list=仪表盘列表 i18n_panel_list=仪表盘列表
i18n_processing_data=正在處理數據,稍後刷新
\ No newline at end of file
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论