2025-12-03 zwy 删除任务失败时返回错误码，不返回异常。

zhaowenyu

2025-12-03 97aed6e19bac0fefaaf0270ba94492228ebf0bb1

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

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

import com.ard.sample.common.error.CommonErrorEnum;
import com.ard.sample.common.model.ResponseResult;
import com.ard.sample.component.mqtt.model.*;
import com.ard.sample.component.mqtt.service.IMessageSenderService;
import com.ard.common.core.redis.RedisConst;
import com.ard.common.core.redis.RedisOpsUtils;
import com.ard.sample.component.websocket.enums.MessageType;
import com.ard.sample.component.websocket.handler.DockWebSocketHandler;
import com.ard.sample.component.websocket.model.BizCodeEnum;
import com.ard.sample.component.websocket.model.CustomWebSocketMessage;
import com.ard.sample.component.websocket.service.ISendMessageService;
@@ -48,6 +51,9 @@
    private ObjectMapper mapper;

    @Autowired
    private DockWebSocketHandler _dockWebSocketHandler;

    @Autowired
    private ISendMessageService websocketMessageService;

    @Autowired
@@ -66,13 +72,19 @@
                new TypeReference<EventsReceiver<WaylineTaskProgressReceiver>>(){});
        eventsReceiver.setBid(receiver.getBid());
        eventsReceiver.setSn(receiver.getGateway());
        eventsReceiver.setGateway(receiver.getGateway());
        eventsReceiver.setType(MessageType.STATUS.getType()+"-flighttask_progress");
        eventsReceiver.setMethod(EventsMethodEnum.FLIGHT_TASK_PROGRESS.getMethod());



        WaylineTaskProgressReceiver output = eventsReceiver.getOutput();

        log.info("Task progress: {}", output.getProgress().toString());

        if (eventsReceiver.getResult() != ResponseResult.CODE_SUCCESS) {
            log.error("Task progress ===> Error code: " + eventsReceiver.getResult());
            String errorMsg = CommonErrorEnum.getMsgByCode(eventsReceiver.getResult());
            log.error("Task progress ===> Error code: {},Error Msg: {}", eventsReceiver.getResult(),errorMsg);
        }

        EventsResultStatusEnum statusEnum = EventsResultStatusEnum.find(output.getStatus());
@@ -112,7 +124,7 @@
                        .bizCode(BizCodeEnum.FLIGHT_TASK_PROGRESS.getCode())
                        .build());

        if (receiver.getNeedReply() == 1) {
        if (receiver.getNeedReply()!=null &&receiver.getNeedReply() == 1) {
            messageSender.publish(receivedTopic + TopicConst._REPLY_SUF,
                    CommonTopicResponse.builder()
                            .tid(receiver.getTid())
@@ -122,8 +134,30 @@
                            .data(RequestsReply.success())
                            .build());
        }
        // 进度
        if(eventsReceiver.getOutput().getProgress().getPercent()>=95){
            return;
        }
        String json="";
        try {
            json = mapper.writeValueAsString(eventsReceiver);
        }
        catch (Exception e){
            e.printStackTrace();
        }
        _dockWebSocketHandler.sendMessageToSubscribers(dockSn, MessageType.STATUS.getType(),json);
    }

    /**
     * 定时检查并处理航线定时任务
     * <p>
     * 该方法每5秒执行一次，从Redis有序集合中获取最早需要执行的任务，检查其执行时间：
     * 1. 若任务已过期（超过当前时间30秒），则标记为失败并删除
     * 2. 若任务在允许的时间窗口内（当前时间±30秒），则执行任务并删除
     * </p>
     *
     * <p>任务ID格式：{workspace_id}:{dock_sn}:{job_id}</p>
     */
    @Scheduled(initialDelay = 10, fixedRate = 5, timeUnit = TimeUnit.SECONDS)
    private void checkScheduledJob() {
        Object jobIdValue = RedisOpsUtils.zGetMin(RedisConst.WAYLINE_JOB_TIMED_EXECUTE);