diff --git a/dinky-admin/src/main/java/org/dinky/service/impl/DataBaseServiceImpl.java b/dinky-admin/src/main/java/org/dinky/service/impl/DataBaseServiceImpl.java index 7d1b424ea9..1e3daa90d4 100644 --- a/dinky-admin/src/main/java/org/dinky/service/impl/DataBaseServiceImpl.java +++ b/dinky-admin/src/main/java/org/dinky/service/impl/DataBaseServiceImpl.java @@ -37,6 +37,7 @@ import org.dinky.data.model.Task; import org.dinky.data.result.SqlExplainResult; import org.dinky.job.Job; +import org.dinky.job.Job.JobStatus; import org.dinky.job.JobResult; import org.dinky.mapper.DataBaseMapper; import org.dinky.metadata.driver.Driver; @@ -305,6 +306,7 @@ public JobResult executeCommonSql(SqlDTO sqlDTO) { result.setSuccess(false); result.setError("please assign data source"); result.setEndTime(LocalDateTime.now()); + result.setStatus(JobStatus.FAILED); return result; } @@ -313,6 +315,7 @@ public JobResult executeCommonSql(SqlDTO sqlDTO) { result.setSuccess(false); result.setError("data source not exist."); result.setEndTime(LocalDateTime.now()); + result.setStatus(JobStatus.FAILED); return result; } @@ -324,9 +327,11 @@ public JobResult executeCommonSql(SqlDTO sqlDTO) { result.setResult(selectResult); if (selectResult.isSuccess()) { result.setSuccess(true); + result.setStatus(JobStatus.SUCCESS); } else { result.setSuccess(false); result.setError(selectResult.getError()); + result.setStatus(JobStatus.FAILED); } result.setEndTime(LocalDateTime.now()); return result; diff --git a/dinky-admin/src/main/java/org/dinky/service/task/CommonSqlTask.java b/dinky-admin/src/main/java/org/dinky/service/task/CommonSqlTask.java index 760e46dae7..5c0a8688b1 100644 --- a/dinky-admin/src/main/java/org/dinky/service/task/CommonSqlTask.java +++ b/dinky-admin/src/main/java/org/dinky/service/task/CommonSqlTask.java @@ -61,7 +61,7 @@ public List explain() { @Override public JobResult execute() { log.info("Preparing to execute common sql..."); - SqlDTO sqlDTO = SqlDTO.build(task.getStatement(), task.getDatabaseId(), null); + SqlDTO sqlDTO = SqlDTO.build(task.getStatement(), task.getDatabaseId(), task.getMaxRowNum()); DataBaseService dataBaseService = SpringUtil.getBean(DataBaseService.class); JobResult jobResult = dataBaseService.executeCommonSql(sqlDTO); return jobResult; @@ -70,7 +70,7 @@ public JobResult execute() { @Override public JobResult StreamExecute() { log.info("Preparing to execute common sql..."); - SqlDTO sqlDTO = SqlDTO.build(task.getStatement(), task.getDatabaseId(), null); + SqlDTO sqlDTO = SqlDTO.build(task.getStatement(), task.getDatabaseId(), task.getMaxRowNum()); DataBaseService dataBaseService = SpringUtil.getBean(DataBaseService.class); JobResult jobResult = dataBaseService.StreamExecuteCommonSql(sqlDTO); return jobResult;