2025-12-16 zwy 优化循环任务逻辑

zhaowenyu

2025-12-16 0fcc9721259214b647fe1b7fed0e00b09dfd4457

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

@@ -366,10 +366,10 @@
        // 下发参数打印
        try{
            String json = objectMapper.writeValueAsString(flightTask);
            log.info("机场下发航线任务的参数flightTask：{}", json);
            log.info("机场下发循环任务子任务-定时任务的航线任务的参数flightTask：{}", json);
        }
        catch (Exception e){
            log.error("机场下发航线任务的参数flightTask异常：{}", e.getMessage());
            log.error("机场下发循环任务子任务-定时任务的航线任务的参数flightTask异常：{}", e.getMessage());
        }

        String topic = TopicConst.THING_MODEL_PRE + TopicConst.PRODUCT +
@@ -384,9 +384,9 @@

        ServiceReply serviceReply = messageSender.publishWithReply(topic, response);

        log.info("下发任务结果： {}", serviceReply.getResult());
        log.info("机场任务航线文件url地址：{}", httpUrl);
        log.info("机场任务航线文件md5值：{}", md5);
        log.info("下发循环任务子任务-定时任务的结果： {}", serviceReply.getResult());
        log.info("机场循环任务子任务-定时任务的航线文件url地址：{}", httpUrl);
        log.info("机场循环任务子任务-定时任务的航线文件md5值：{}", md5);

        if (ResponseResult.CODE_SUCCESS != serviceReply.getResult()) {
            String errorMsg = CommonErrorEnum.getMsgByCode(serviceReply.getResult());
@@ -403,11 +403,11 @@

        // 飞行命令先注释掉
        // Issue an immediate task execution command.
        if (WaylineTaskTypeEnum.IMMEDIATE.getVal() == waylineJob.getTaskType()) {
            if (!executeFlightTask(waylineJob.getJobId())) {
                return ResponseResult.error("无法执行作业。");
            }
        }
//        if (WaylineTaskTypeEnum.IMMEDIATE.getVal() == waylineJob.getTaskType()) {
//            if (!executeFlightTask(waylineJob.getJobId())) {
//                return ResponseResult.error("无法执行作业。");
//            }
//        }

        if (WaylineTaskTypeEnum.TIMED.getVal() == waylineJob.getTaskType()) {
            boolean isAdd = RedisOpsUtils.zAdd(RedisConst.WAYLINE_JOB_TIMED_EXECUTE,