liusuyi
2025-11-19 ffc398d416aa4ba4f294c0cb86964e5cecff2ee7
ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java
@@ -179,13 +179,14 @@
        }
        Optional<WaylineJobDTO> waylineJobOpt = this.createWaylineJob(param, loginUser.getUsername(),
                param.getExecuteTime(), param.getExecuteTime());
        if (waylineJobOpt.isEmpty()) {
            return ResponseResult.error("创建机场任务失败!");
        }
        // 循环任务
        if (param.getTaskType() == WaylineTaskTypeEnum.LOOP.getVal()) {
            // 循环任务,不立即执行,由定时任务发布
            return ResponseResult.success();
        }
        if (waylineJobOpt.isEmpty()) {
            return ResponseResult.error("创建机场任务失败!");
        }
        WaylineJobDTO waylineJob = waylineJobOpt.get();
@@ -248,6 +249,7 @@
                .build();
        ServiceReply serviceReply = messageSender.publishWithReply(topic, response);
        log.info("下发任务结果: {}", serviceReply.getResult());
        if (ResponseResult.CODE_SUCCESS != serviceReply.getResult()) {
            log.info("Prepare task ====> Error code: {}", serviceReply.getResult());
            this.updateJob(WaylineJobDTO.builder()
@@ -335,6 +337,7 @@
                .build();
        ServiceReply serviceReply = messageSender.publishWithReply(topic, response);
        log.info("下发任务结果: {}", serviceReply.getResult());
        if (ResponseResult.CODE_SUCCESS != serviceReply.getResult()) {
            log.info("Prepare task ====> Error code: {}", serviceReply.getResult());
            this.updateJob(WaylineJobDTO.builder()
@@ -437,8 +440,9 @@
        // Check if the task status is correct.
        boolean isErr = !jobIds.removeAll(waylineJobIds) || !jobIds.isEmpty();
        if (isErr) {
            throw new IllegalArgumentException("These tasks have an incorrect status and cannot be canceled. "
                    + Arrays.toString(jobIds.toArray()));
            throw new IllegalArgumentException("任务开始后,无法取消。" + Arrays.toString(jobIds.toArray()));
//            throw new IllegalArgumentException("These tasks have an incorrect status and cannot be canceled. "
//                    + Arrays.toString(jobIds.toArray()));
        }
        // Group job id by dock sn.
@@ -578,8 +582,8 @@
                new Page<WaylineJobEntity>(page, pageSize),
                new LambdaQueryWrapper<WaylineJobEntity>()
                        // 实际开始时间筛选,允许为空,为空则不进行筛选
                        .ge(startTime != null, WaylineJobEntity::getExecuteTime, startTime)
                        .le(endTime != null, WaylineJobEntity::getExecuteTime, endTime)
                        .ge(startTime != null, WaylineJobEntity::getBeginTime, startTime)
                        .le(endTime != null, WaylineJobEntity::getBeginTime, endTime)
                        // 任务类型筛选,允许为空,为空则不进行筛选
                        .eq(taskType != null, WaylineJobEntity::getTaskType, taskType)
                        // 任务名称筛选,允许为空,为空则不进行筛选;....模糊查询