2025-12-03 zwy 跟踪任务id获取任务详情接口调整；定时任务时，增加status状态pending：待执行，并发给前端

zhaowenyu

2025-12-04 9de7bdfd10bf84a5e5fbbdc4853e8b30bf7cd0c9

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

@@ -502,7 +502,7 @@
////                    + Arrays.toString(jobIds.toArray()));
//        }

        // Group job id by dock sn.
        // 按 dock sn 对作业 ID 进行分组。
        Map<String, List<String>> dockJobs = waylineJobs.stream()
                .collect(Collectors.groupingBy(WaylineJobDTO::getDockSn,
                        Collectors.mapping(WaylineJobDTO::getJobId, Collectors.toList())));
@@ -591,7 +591,17 @@
     */
    @Override
    public ResponseResult publishCancelTask(String dockSn, List<String> jobIds) {

        for(String jobId : jobIds) {
            Optional<WaylineJobDTO> waylineJobDTO = this.getJobByJobId(jobId);
            if (waylineJobDTO.isEmpty()) {
                return ResponseResult.error("任务不存在，jobId: " + jobId);
            }
            if (waylineJobDTO.get().getTaskType() == 3) {
                // 已经执行完的子任务是否删除，或者清掉父任务ID，和正常任务一起显示在列表中。
                this.deleteTask(jobId);
                return ResponseResult.success();
            }
        }
        boolean isOnline = deviceService.checkDeviceOnline(dockSn);
        if (!isOnline) {
            Integer errorCode = CommonErrorEnum.DEVICE_OFFLINE.getErrorCode();
@@ -620,7 +630,7 @@
                    .status(WaylineJobStatusEnum.CANCEL.getVal())
                    .completedTime(LocalDateTime.now())
                    .build());
            RedisOpsUtils.zRemove(RedisConst.WAYLINE_JOB_TIMED_EXECUTE, RedisConst.DELIMITER + dockSn + RedisConst.DELIMITER + jobId);
            RedisOpsUtils.zRemove(RedisConst.WAYLINE_JOB_TIMED_EXECUTE, dockSn + RedisConst.DELIMITER + jobId);
            // 原流程是修改表中数据的status状态值，现在的精力是直接删除
            this.deleteTask(jobId);
        }
@@ -644,7 +654,8 @@
    public List<WaylineJobDTO> getJobsByConditions(Collection<String> jobIds, WaylineJobStatusEnum status) {
        return mapper.selectList(
                        new LambdaQueryWrapper<WaylineJobEntity>()
                                .eq(Objects.nonNull(status), WaylineJobEntity::getStatus, status.getVal())
                                // 不过滤状态,
                                //.eq(Objects.nonNull(status), WaylineJobEntity::getStatus, status.getVal())
                                .and(!CollectionUtils.isEmpty(jobIds),
                                        wrapper -> jobIds.forEach(id -> wrapper.eq(WaylineJobEntity::getJobId, id).or())))
                .stream()
@@ -761,6 +772,18 @@
                .orderByDesc(WaylineJobEntity::getId));
    }

    /**
     * 获取所有待定状态的定时任务，未执行即将要执行的。
     * */
    public List<WaylineJobEntity> selectScheduledTaskList(){
        // "1":"定时任务"
        return mapper.selectList(new LambdaQueryWrapper<WaylineJobEntity>()
                .eq(WaylineJobEntity::getTaskType, 1)
                .eq(WaylineJobEntity::getStatus, WaylineJobStatusEnum.PENDING.getVal())
                .gt(WaylineJobEntity::getBeginTime, System.currentTimeMillis())
                .orderByDesc(WaylineJobEntity::getBeginTime));
    }


    /**
     * 根据航班任务ID获取航班任务资源