Commit 27691cb2 authored by wenmo's avatar wenmo

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

parent 7246b1f5
...@@ -128,18 +128,18 @@ public class APIController { ...@@ -128,18 +128,18 @@ public class APIController {
} }
/** /**
* 获取Job实例的所有信息 * 获取Job实例的信息
*/ */
@GetMapping("/getJobInfoDetail") @GetMapping("/getJobInstance")
public Result getJobInfoDetail(@RequestParam Integer id) { public Result getJobInstance(@RequestParam Integer id) {
return Result.succeed(jobInstanceService.getJobInfoDetail(id), "获取成功"); return Result.succeed(jobInstanceService.getById(id), "获取成功");
} }
/** /**
* 通过 taskId 获取 Task 对应的 Job 实例的所有信息 * 通过 taskId 获取 Task 对应的 Job 实例的信息
*/ */
@GetMapping("/getJobInfoDetailByTaskId") @GetMapping("/getJobInstanceByTaskId")
public Result getJobInfoDetailByTaskId(@RequestParam Integer id) { public Result getJobInstanceByTaskId(@RequestParam Integer id) {
return Result.succeed(jobInstanceService.getJobInstanceByTaskId(id), "获取成功"); return Result.succeed(jobInstanceService.getJobInstanceByTaskId(id), "获取成功");
} }
} }
...@@ -400,8 +400,10 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen ...@@ -400,8 +400,10 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
} else { } else {
return Result.failed("上线失败,原因:" + jobResult.getError()); return Result.failed("上线失败,原因:" + jobResult.getError());
} }
}else if (JobLifeCycle.ONLINE.equalsValue(task.getStep())) {
return Result.failed("上线失败,当前作业已上线。");
} }
return Result.failed("上线失败,作业不存在。"); return Result.failed("上线失败,当前作业未发布。");
} }
@Override @Override
......
...@@ -72,7 +72,7 @@ const TaskAPI = (props: any) => { ...@@ -72,7 +72,7 @@ const TaskAPI = (props: any) => {
} }
key="taskInstance" 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"/> height='500px' theme="vs-dark"/>
</TabPane> </TabPane>
<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