Unverified Commit 31ca6734 authored by aiwenmo's avatar aiwenmo Committed by GitHub

[Optimization-641][admin] Optimize job instance api

[Optimization-641][admin] Optimize job instance api
parents 7246b1f5 27691cb2
......@@ -128,18 +128,18 @@ public class APIController {
}
/**
* 获取Job实例的所有信息
* 获取Job实例的信息
*/
@GetMapping("/getJobInfoDetail")
public Result getJobInfoDetail(@RequestParam Integer id) {
return Result.succeed(jobInstanceService.getJobInfoDetail(id), "获取成功");
@GetMapping("/getJobInstance")
public Result getJobInstance(@RequestParam Integer id) {
return Result.succeed(jobInstanceService.getById(id), "获取成功");
}
/**
* 通过 taskId 获取 Task 对应的 Job 实例的所有信息
* 通过 taskId 获取 Task 对应的 Job 实例的信息
*/
@GetMapping("/getJobInfoDetailByTaskId")
public Result getJobInfoDetailByTaskId(@RequestParam Integer id) {
@GetMapping("/getJobInstanceByTaskId")
public Result getJobInstanceByTaskId(@RequestParam Integer id) {
return Result.succeed(jobInstanceService.getJobInstanceByTaskId(id), "获取成功");
}
}
......@@ -400,8 +400,10 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
} else {
return Result.failed("上线失败,原因:" + jobResult.getError());
}
}else if (JobLifeCycle.ONLINE.equalsValue(task.getStep())) {
return Result.failed("上线失败,当前作业已上线。");
}
return Result.failed("上线失败,作业不存在。");
return Result.failed("上线失败,当前作业未发布。");
}
@Override
......
......@@ -72,7 +72,7 @@ const TaskAPI = (props: any) => {
}
key="taskInstance"
>
<CodeShow code={`curl http://${address}/openapi/getJobInfoDetailByTaskId?id=${(task ? task.id : '1')}`} language='shell'
<CodeShow code={`curl http://${address}/openapi/getJobInstanceByTaskId?id=${(task ? task.id : '1')}`} language='shell'
height='500px' theme="vs-dark"/>
</TabPane>
<TabPane
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment