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

feat(sj_map_reduce): 获取任务项列表接口新增任务状态查询字段

Browse Source
This commit is contained in:
xlsea 2024-06-21 15:27:05 +08:00
parent 0e8b92b7c1
commit ac27041be6
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/JobTaskQueryVO.java
View File

@ -15,4 +15,5 @@ public class JobTaskQueryVO extends BaseQueryVO {
private Long jobId;
private Long taskBatchId;
private Long parentId;
private Integer taskStatus;
}

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

@ -35,11 +35,11 @@ public class JobTaskServiceImpl implements JobTaskService {
public PageResult<List<JobTaskResponseVO>> getJobTaskPage(final JobTaskQueryVO queryVO) {
PageDTO<JobTask> pageDTO = new PageDTO<>(queryVO.getPage(), queryVO.getSize());
PageDTO<JobTask> selectPage = jobTaskMapper.selectPage(pageDTO,
new LambdaQueryWrapper<JobTask>()
.eq(Objects.nonNull(queryVO.getJobId()), JobTask::getJobId, queryVO.getJobId())
.eq(Objects.nonNull(queryVO.getTaskBatchId()), JobTask::getTaskBatchId, queryVO.getTaskBatchId())
.eq(Objects.nonNull(queryVO.getTaskStatus()), JobTask::getTaskStatus, queryVO.getTaskStatus())
// SQLServer 分页必须 ORDER BY
.orderByAsc(JobTask::getJobId));
@ -55,12 +55,12 @@ public class JobTaskServiceImpl implements JobTaskService {
@Override
public List<Tree<Long>> getTreeJobTask(final JobTaskQueryVO queryVO) {
List<JobTask> jobTasks = jobTaskMapper.selectList(
new LambdaQueryWrapper<JobTask>()
.eq(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));
new LambdaQueryWrapper<JobTask>()
.eq(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));
List<TreeNode<Long>> treeNodes = new ArrayList<>();
for (final JobTask jobTask : jobTasks) {