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

fix: excel 数据集记录日志

Browse Source
This commit is contained in:
taojinlong 2022-05-04 12:24:10 +08:00
parent 4ad1344872
commit 40a0e196e4
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskLogController.java
View File

@ -35,7 +35,7 @@ public class DataSetTableTaskLogController {
@ApiOperation("保存") @ApiOperation("保存")
@PostMapping("save") @PostMapping("save")
public DatasetTableTaskLog save(@RequestBody DatasetTableTaskLog datasetTableTaskLog) { public DatasetTableTaskLog save(@RequestBody DatasetTableTaskLog datasetTableTaskLog) {
return dataSetTableTaskLogService.save(datasetTableTaskLog); return dataSetTableTaskLogService.save(datasetTableTaskLog, true);
} }
@ApiOperation("分页查询") @ApiOperation("分页查询")

4
backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskLogService.java
View File

@ -33,8 +33,8 @@ public class DataSetTableTaskLogService {
@Resource @Resource
private DatasetTableTaskMapper datasetTableTaskMapper; private DatasetTableTaskMapper datasetTableTaskMapper;
public DatasetTableTaskLog save(DatasetTableTaskLog datasetTableTaskLog) { public DatasetTableTaskLog save(DatasetTableTaskLog datasetTableTaskLog, Boolean hasTask) {
if(datasetTableTaskMapper.selectByPrimaryKey(datasetTableTaskLog.getTaskId()) == null){ if(hasTask && datasetTableTaskMapper.selectByPrimaryKey(datasetTableTaskLog.getTaskId()) == null){
return datasetTableTaskLog; return datasetTableTaskLog;
} }
if (StringUtils.isEmpty(datasetTableTaskLog.getId())) { if (StringUtils.isEmpty(datasetTableTaskLog.getId())) {

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

@ -137,7 +137,7 @@ public class DataSetTableTaskService {
datasetTableTaskLog.setStatus(JobStatus.Underway.name()); datasetTableTaskLog.setStatus(JobStatus.Underway.name());
datasetTableTaskLog.setStartTime(startTime); datasetTableTaskLog.setStartTime(startTime);
datasetTableTaskLog.setTriggerType(TriggerType.Custom.name()); datasetTableTaskLog.setTriggerType(TriggerType.Custom.name());
dataSetTableTaskLogService.save(datasetTableTaskLog); dataSetTableTaskLogService.save(datasetTableTaskLog, true);
} }
return existSyncTask; return existSyncTask;
} }

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

@ -178,7 +178,7 @@ public class ExtractDataService {
return o1.getColumnIndex().compareTo(o2.getColumnIndex()); return o1.getColumnIndex().compareTo(o2.getColumnIndex());
}); });
DatasetTableTaskLog datasetTableTaskLog = writeDatasetTableTaskLog(datasetTableId, ops); DatasetTableTaskLog datasetTableTaskLog = writeExcelLog(datasetTableId, ops);
switch (updateType) { switch (updateType) {
case all_scope: // 全量更新 case all_scope: // 全量更新
try { try {
@ -193,7 +193,7 @@ public class ExtractDataService {
extractExcelDataForSimpleMode(datasetTable, "all_scope"); extractExcelDataForSimpleMode(datasetTable, "all_scope");
} }
replaceTable(TableUtils.tableName(datasetTableId)); replaceTable(TableUtils.tableName(datasetTableId));
saveSuccessLog(datasetTableTaskLog); saveSuccessLog(datasetTableTaskLog, false);
updateTableStatus(datasetTableId, JobStatus.Completed, execTime); updateTableStatus(datasetTableId, JobStatus.Completed, execTime);
if (ops.equalsIgnoreCase("替换")) { if (ops.equalsIgnoreCase("替换")) {
List<DatasetTableField> oldFileds = getDatasetTableFields(datasetTable.getId()); List<DatasetTableField> oldFileds = getDatasetTableFields(datasetTable.getId());
@ -226,7 +226,7 @@ public class ExtractDataService {
toDelete.forEach(datasetTableField -> dataSetTableFieldsService.delete(datasetTableField.getId())); toDelete.forEach(datasetTableField -> dataSetTableFieldsService.delete(datasetTableField.getId()));
} }
} catch (Exception e) { } catch (Exception e) {
saveErrorLog(datasetTableTaskLog, e); saveErrorLog(datasetTableTaskLog, e, false);
updateTableStatus(datasetTableId, JobStatus.Error, null); updateTableStatus(datasetTableId, JobStatus.Error, null);
dropDorisTable(TableUtils.tmpName(TableUtils.tableName(datasetTableId))); dropDorisTable(TableUtils.tmpName(TableUtils.tableName(datasetTableId)));
} finally { } finally {
@ -245,10 +245,10 @@ public class ExtractDataService {
} else { } else {
extractExcelDataForSimpleMode(datasetTable, "incremental_add"); extractExcelDataForSimpleMode(datasetTable, "incremental_add");
} }
saveSuccessLog(datasetTableTaskLog); saveSuccessLog(datasetTableTaskLog, false);
updateTableStatus(datasetTableId, JobStatus.Completed, execTime); updateTableStatus(datasetTableId, JobStatus.Completed, execTime);
} catch (Exception e) { } catch (Exception e) {
saveErrorLog(datasetTableTaskLog, e); saveErrorLog(datasetTableTaskLog, e, false);
updateTableStatus(datasetTableId, JobStatus.Error, null); updateTableStatus(datasetTableId, JobStatus.Error, null);
} finally { } finally {
deleteFile("incremental_add", datasetTableId); deleteFile("incremental_add", datasetTableId);
@ -314,11 +314,11 @@ public class ExtractDataService {
execTime = System.currentTimeMillis(); execTime = System.currentTimeMillis();
extractData(datasetTable, datasource, datasetTableFields, "all_scope", null); extractData(datasetTable, datasource, datasetTableFields, "all_scope", null);
replaceTable(TableUtils.tableName(datasetTableId)); replaceTable(TableUtils.tableName(datasetTableId));
saveSuccessLog(datasetTableTaskLog); saveSuccessLog(datasetTableTaskLog, true);
msg = true; msg = true;
lastExecStatus = JobStatus.Completed; lastExecStatus = JobStatus.Completed;
} catch (Exception e) { } catch (Exception e) {
saveErrorLog(datasetTableTaskLog, e); saveErrorLog(datasetTableTaskLog, e, true);
msg = false; msg = false;
lastExecStatus = JobStatus.Error; lastExecStatus = JobStatus.Error;
execTime = null; execTime = null;
@ -374,11 +374,11 @@ public class ExtractDataService {
extractData(datasetTable, datasource, datasetTableFields, "incremental_delete", sql); extractData(datasetTable, datasource, datasetTableFields, "incremental_delete", sql);
} }
} }
saveSuccessLog(datasetTableTaskLog); saveSuccessLog(datasetTableTaskLog, true);
msg = true; msg = true;
lastExecStatus = JobStatus.Completed; lastExecStatus = JobStatus.Completed;
} catch (Exception e) { } catch (Exception e) {
saveErrorLog(datasetTableTaskLog, e); saveErrorLog(datasetTableTaskLog, e, true);
msg = false; msg = false;
lastExecStatus = JobStatus.Error; lastExecStatus = JobStatus.Error;
execTime = null; execTime = null;
@ -600,18 +600,18 @@ public class ExtractDataService {
dataSetTableService.updateByExampleSelective(datasetTableRecord, example); dataSetTableService.updateByExampleSelective(datasetTableRecord, example);
} }
private void saveSuccessLog(DatasetTableTaskLog datasetTableTaskLog) { private void saveSuccessLog(DatasetTableTaskLog datasetTableTaskLog, Boolean hasTask) {
datasetTableTaskLog.setStatus(JobStatus.Completed.name()); datasetTableTaskLog.setStatus(JobStatus.Completed.name());
datasetTableTaskLog.setEndTime(System.currentTimeMillis()); datasetTableTaskLog.setEndTime(System.currentTimeMillis());
dataSetTableTaskLogService.save(datasetTableTaskLog); dataSetTableTaskLogService.save(datasetTableTaskLog, hasTask);
} }
private void saveErrorLog(DatasetTableTaskLog datasetTableTaskLog, Exception e) { private void saveErrorLog(DatasetTableTaskLog datasetTableTaskLog, Exception e, Boolean hasTask) {
LogUtil.error("Extract data error: " + datasetTableTaskLog.getTaskId(), e); LogUtil.error("Extract data error: " + datasetTableTaskLog.getTaskId(), e);
datasetTableTaskLog.setStatus(JobStatus.Error.name()); datasetTableTaskLog.setStatus(JobStatus.Error.name());
datasetTableTaskLog.setInfo(e.getMessage()); datasetTableTaskLog.setInfo(e.getMessage());
datasetTableTaskLog.setEndTime(System.currentTimeMillis()); datasetTableTaskLog.setEndTime(System.currentTimeMillis());
dataSetTableTaskLogService.save(datasetTableTaskLog); dataSetTableTaskLogService.save(datasetTableTaskLog, hasTask);
} }
private void createEngineTable(String tableName, List<DatasetTableField> datasetTableFields) throws Exception { private void createEngineTable(String tableName, List<DatasetTableField> datasetTableFields) throws Exception {
@ -667,14 +667,14 @@ public class ExtractDataService {
return null; return null;
} }
private DatasetTableTaskLog writeDatasetTableTaskLog(String datasetTableId, String taskId) { private DatasetTableTaskLog writeExcelLog(String datasetTableId, String taskId) {
DatasetTableTaskLog datasetTableTaskLog = new DatasetTableTaskLog(); DatasetTableTaskLog datasetTableTaskLog = new DatasetTableTaskLog();
datasetTableTaskLog.setTableId(datasetTableId); datasetTableTaskLog.setTableId(datasetTableId);
datasetTableTaskLog.setTaskId(taskId); datasetTableTaskLog.setTaskId(taskId);
datasetTableTaskLog.setStatus(JobStatus.Underway.name()); datasetTableTaskLog.setStatus(JobStatus.Underway.name());
datasetTableTaskLog.setTriggerType(TriggerType.Cron.name()); datasetTableTaskLog.setTriggerType(TriggerType.Cron.name());
datasetTableTaskLog.setStartTime(System.currentTimeMillis()); datasetTableTaskLog.setStartTime(System.currentTimeMillis());
dataSetTableTaskLogService.save(datasetTableTaskLog); dataSetTableTaskLogService.save(datasetTableTaskLog, false);
return datasetTableTaskLog; return datasetTableTaskLog;
} }
@ -696,7 +696,7 @@ public class ExtractDataService {
} }
datasetTableTaskLog.setTriggerType(TriggerType.Cron.name()); datasetTableTaskLog.setTriggerType(TriggerType.Cron.name());
datasetTableTaskLog.setStartTime(startTime); datasetTableTaskLog.setStartTime(startTime);
dataSetTableTaskLogService.save(datasetTableTaskLog); dataSetTableTaskLogService.save(datasetTableTaskLog, true);
return datasetTableTaskLog; return datasetTableTaskLog;
} }