gtsoft/gtsoft-snail-job-server
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

refactor(sj_map_reduce): 修改获取任务项树接口返回结构

Browse Source
This commit is contained in:
xlsea 2024-06-22 15:57:22 +08:00
parent 6f1d04b854
commit 61d67455be
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/controller/JobTaskController.java
View File

@ -32,7 +32,7 @@ public class JobTaskController {
@GetMapping("/tree/list")
@LoginRequired
public List<Tree<Long>> getTreeJobTask(JobTaskQueryVO jobTaskQueryVO) {
public PageResult<List<Tree<Long>>> getTreeJobTask(JobTaskQueryVO jobTaskQueryVO) {
return jobTaskService.getTreeJobTask(jobTaskQueryVO);
}

2
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/JobTaskService.java
View File

@ -16,5 +16,5 @@ public interface JobTaskService {
PageResult<List<JobTaskResponseVO>> getJobTaskPage(JobTaskQueryVO jobTaskQueryVO);
List<Tree<Long>> getTreeJobTask(JobTaskQueryVO jobTaskQueryVO);
PageResult<List<Tree<Long>>> getTreeJobTask(JobTaskQueryVO jobTaskQueryVO);
}

16
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobTaskServiceImpl.java
View File

@ -54,20 +54,24 @@ public class JobTaskServiceImpl implements JobTaskService {
}
@Override
public List<Tree<Long>> getTreeJobTask(final JobTaskQueryVO queryVO) {
List<JobTask> jobTasks = jobTaskMapper.selectList(
public PageResult<List<Tree<Long>>> getTreeJobTask(final JobTaskQueryVO queryVO) {
List<JobTask> taskList = jobTaskMapper.selectList(
new LambdaQueryWrapper<JobTask>()
.eq(JobTask::getParentId, queryVO.getParentId())
.eq(Objects.nonNull(queryVO.getParentId()), JobTask::getParentId, queryVO.getParentId())
.eq(Objects.nonNull(queryVO.getJobId()), JobTask::getJobId, queryVO.getJobId())
.eq(Objects.nonNull(queryVO.getTaskBatchId()), JobTask::getTaskBatchId, queryVO.getTaskBatchId())
// SQLServer 分页必须 ORDER BY
.orderByAsc(JobTask::getJobId));
return TreeUtil.build(jobTasks, 0L, (jobTask, tree) -> {
TreeNodeConfig config = new TreeNodeConfig();
config.setNameKey("taskName");
config.setChildrenKey("children");
List<Tree<Long>> treeList = TreeUtil.build(taskList, Objects.nonNull(queryVO.getParentId()) ? queryVO.getParentId() : 0L, config, (jobTask, tree) -> {
tree.putAll(JsonUtil.parseHashMap(JsonUtil.toJsonString(jobTask), Object.class));
tree.setId(jobTask.getId());
tree.setName(jobTask.getTaskName());
tree.setParentId(jobTask.getParentId());
tree.putExtra("jobTask", jobTask);
});
return new PageResult<>(new PageDTO<>(queryVO.getPage(), queryVO.getSize(), treeList.size()), treeList);
}
}