Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dlink
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhaowei
dlink
Commits
31ca6734
Unverified
Commit
31ca6734
authored
Jun 24, 2022
by
aiwenmo
Committed by
GitHub
Jun 24, 2022
Browse files
Options
Browse Files
Download
Plain Diff
[Optimization-641][admin] Optimize job instance api
[Optimization-641][admin] Optimize job instance api
parents
7246b1f5
27691cb2
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
9 deletions
+11
-9
APIController.java
...min/src/main/java/com/dlink/controller/APIController.java
+7
-7
TaskServiceImpl.java
...src/main/java/com/dlink/service/impl/TaskServiceImpl.java
+3
-1
index.tsx
dlink-web/src/pages/API/TaskAPI/index.tsx
+1
-1
No files found.
dlink-admin/src/main/java/com/dlink/controller/APIController.java
View file @
31ca6734
...
@@ -128,18 +128,18 @@ public class APIController {
...
@@ -128,18 +128,18 @@ public class APIController {
}
}
/**
/**
* 获取Job实例的
所有
信息
* 获取Job实例的信息
*/
*/
@GetMapping
(
"/getJobIn
foDetail
"
)
@GetMapping
(
"/getJobIn
stance
"
)
public
Result
getJobIn
foDetail
(
@RequestParam
Integer
id
)
{
public
Result
getJobIn
stance
(
@RequestParam
Integer
id
)
{
return
Result
.
succeed
(
jobInstanceService
.
get
JobInfoDetail
(
id
),
"获取成功"
);
return
Result
.
succeed
(
jobInstanceService
.
get
ById
(
id
),
"获取成功"
);
}
}
/**
/**
* 通过 taskId 获取 Task 对应的 Job 实例的
所有
信息
* 通过 taskId 获取 Task 对应的 Job 实例的信息
*/
*/
@GetMapping
(
"/getJobIn
foDetail
ByTaskId"
)
@GetMapping
(
"/getJobIn
stance
ByTaskId"
)
public
Result
getJobIn
foDetail
ByTaskId
(
@RequestParam
Integer
id
)
{
public
Result
getJobIn
stance
ByTaskId
(
@RequestParam
Integer
id
)
{
return
Result
.
succeed
(
jobInstanceService
.
getJobInstanceByTaskId
(
id
),
"获取成功"
);
return
Result
.
succeed
(
jobInstanceService
.
getJobInstanceByTaskId
(
id
),
"获取成功"
);
}
}
}
}
dlink-admin/src/main/java/com/dlink/service/impl/TaskServiceImpl.java
View file @
31ca6734
...
@@ -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
...
...
dlink-web/src/pages/API/TaskAPI/index.tsx
View file @
31ca6734
...
@@ -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/getJobIn
foDetail
ByTaskId?id=${(task ? task.id : '1')}`
}
language=
'shell'
<
CodeShow
code=
{
`curl http://${address}/openapi/getJobIn
stance
ByTaskId?id=${(task ? task.id : '1')}`
}
language=
'shell'
height=
'500px'
theme=
"vs-dark"
/>
height=
'500px'
theme=
"vs-dark"
/>
</
TabPane
>
</
TabPane
>
<
TabPane
<
TabPane
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment