2025-12-02 zwy 计划任务查询任务列表，循环任务按层次展示,调子项字段名为children

zhaowenyu

2025-12-02 cecf52ba70c7d9a8acd0ba251e068adc18c3aa27

 ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java

@@ -1,6 +1,6 @@
package com.ard.sample.wayline.service.impl;

import com.ard.oss.service.impl.OssServiceContext;
import com.ard.ossdock.service.impl.OssDockServiceContext;
import com.ard.route.domain.route.ArdRouteInfo;
import com.ard.route.service.IArdRouteInfoService;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -77,7 +77,7 @@
    private IArdRouteInfoService _ardRouteInfoService;

    @Resource
    private OssServiceContext _ossService;
    private OssDockServiceContext _ossService;

    @Autowired
    private IDeviceService deviceService;
@@ -212,7 +212,7 @@
        // get file url
//        URL url = waylineFileService.getObjectUrl(waylineFile.get().getWaylineId());
        URL url = null;
        String minioUrl = subStringMinioUrlName(ardRouteOpt.getPath());
        String minioUrl = subStringMinioUrlName(ardRouteOpt.getPath1());
        String md5 = "";
        try (InputStream inputStream = _ossService.getObject(kmzPath, minioUrl)) {
            md5 = DigestUtils.md5Hex(inputStream);
@@ -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> childOpt = this.getJobByJobParentId(job.getJobId());
                    job.setChildren(childOpt);
                })
                .collect(Collectors.toList());

        return new PaginationData<WaylineJobDTO>(records, new Pagination(pageData));
@@ -720,7 +737,7 @@

        // get file url
        URL url = null;
        String minioUrl = subStringMinioUrlName(ardRouteOpt.getPath());
        String minioUrl = subStringMinioUrlName(ardRouteOpt.getPath1());
        String md5 = "";
        try (InputStream inputStream = _ossService.getObject(kmzPath, minioUrl)) {
            md5 = DigestUtils.md5Hex(inputStream);