From d67fa83cff00ad9f886d68612affdb7dc85c0bf8 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 02 Dec 2025 10:42:35 +0800
Subject: [PATCH] 2025-12-02 zwy 计划任务查询任务列表，循环任务按层次展示
---
ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java | 19 ++++++++++++++++++-
ard-sample/src/main/java/com/ard/sample/component/websocket/handler/DockWebSocketHandler.java | 2 +-
ard-sample/src/main/java/com/ard/sample/wayline/model/dto/WaylineJobDTO.java | 3 +++
3 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/ard-sample/src/main/java/com/ard/sample/component/websocket/handler/DockWebSocketHandler.java b/ard-sample/src/main/java/com/ard/sample/component/websocket/handler/DockWebSocketHandler.java
index 74fa790..83da8ff 100644
--- a/ard-sample/src/main/java/com/ard/sample/component/websocket/handler/DockWebSocketHandler.java
+++ b/ard-sample/src/main/java/com/ard/sample/component/websocket/handler/DockWebSocketHandler.java
@@ -142,7 +142,7 @@
if (userId != null) {
log.info("用户[{}]连接关闭，将延时5秒执行清理操作（给前端刷新缓冲）", userId);
- // 延时3秒执行清理逻辑
+ // 延时5秒执行清理逻辑
delayExecutor.schedule(() -> {
try {
diff --git a/ard-sample/src/main/java/com/ard/sample/wayline/model/dto/WaylineJobDTO.java b/ard-sample/src/main/java/com/ard/sample/wayline/model/dto/WaylineJobDTO.java
index 4fa6365..826b4ef 100644
--- a/ard-sample/src/main/java/com/ard/sample/wayline/model/dto/WaylineJobDTO.java
+++ b/ard-sample/src/main/java/com/ard/sample/wayline/model/dto/WaylineJobDTO.java
@@ -6,6 +6,7 @@
import lombok.NoArgsConstructor;
import java.time.LocalDateTime;
+import java.util.List;
/**
* @author sean
@@ -65,4 +66,6 @@
private String parentId;
private Integer loopSum;
+
+ private List<WaylineJobDTO> parentJobs;
}
diff --git a/ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java
index e057112..625f8d9 100644
--- a/ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java
@@ -584,6 +584,18 @@
return Optional.ofNullable(entity2Dto(jobEntity));
}
+ public List<WaylineJobDTO> getJobByJobParentId(String parentId) {
+ List<WaylineJobEntity> jobEntities = mapper.selectList(
+ new LambdaQueryWrapper<WaylineJobEntity>()
+ .eq(WaylineJobEntity::getParentId, parentId));
+ if (CollectionUtils.isEmpty(jobEntities)) {
+ return Collections.emptyList(); // 返回不可变空列表，更安全
+ }
+ return jobEntities.stream()
+ .map(this::entity2Dto) // 调用原有的单个转换方法
+ .collect(Collectors.toList());
+ }
+
/**
* 更新作业信息
*
@@ -631,6 +643,7 @@
Page<WaylineJobEntity> pageData = mapper.selectPage(
new Page<WaylineJobEntity>(page, pageSize),
new LambdaQueryWrapper<WaylineJobEntity>()
+ .isNull(WaylineJobEntity::getParentId)
// 实际开始时间筛选，允许为空，为空则不进行筛选
.ge(startTime != null, WaylineJobEntity::getBeginTime, startTime)
.le(endTime != null, WaylineJobEntity::getBeginTime, endTime)
@@ -643,10 +656,14 @@
.ne(isComplete != null && !isComplete, WaylineJobEntity::getStatus, 3)
// 任务状态筛选，允许为空，为空则不进行筛选
.eq(status != null, WaylineJobEntity::getStatus, status)
- .orderByDesc(WaylineJobEntity::getId));
+ .orderByDesc(WaylineJobEntity::getBeginTime));
List<WaylineJobDTO> records = pageData.getRecords()
.stream()
.map(this::entity2Dto)
+ .peek(job -> {
+ List<WaylineJobDTO> parentOpt = this.getJobByJobParentId(job.getJobId());
+ job.setParentJobs(parentOpt);
+ })
.collect(Collectors.toList());
return new PaginationData<WaylineJobDTO>(records, new Pagination(pageData));
--
Gitblit v1.9.3