2025-11-21 zwy 模拟飞行注释

zhaowenyu

2025-11-21 c0c839c0066269d6d7bab08b49fe379781be7617

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

@@ -231,11 +231,11 @@
//                        .fingerprint(waylineFile.get().getSign())
                        .fingerprint(md5)
                        .build())
                .simulateMission(WaylineSimulateMissionDTO.builder()
                        .isEnable(1)
                        .latitude(46.558831038)
                        .longitude(125.148072319)
                        .build())
//                .simulateMission(WaylineSimulateMissionDTO.builder()
//                        .isEnable(1)
//                        .latitude(46.558831038)
//                        .longitude(125.148072319)
//                        .build())
                .build();

        String topic = TopicConst.THING_MODEL_PRE + TopicConst.PRODUCT +
@@ -263,20 +263,20 @@

        // 飞行命令先注释掉
        // Issue an immediate task execution command.
//        if (WaylineTaskTypeEnum.IMMEDIATE.getVal() == waylineJob.getTaskType()) {
//            if (!executeFlightTask(waylineJob.getJobId())) {
//                return ResponseResult.error("Failed to execute job.");
//            }
//        }
//
//        if (WaylineTaskTypeEnum.TIMED.getVal() == waylineJob.getTaskType()) {
//            boolean isAdd = RedisOpsUtils.zAdd(RedisConst.WAYLINE_JOB_TIMED_EXECUTE,
//                     waylineJob.getDockSn() + RedisConst.DELIMITER + waylineJob.getJobId(),
//                    waylineJob.getBeginTime().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
//            if (!isAdd) {
//                return ResponseResult.error("Failed to create scheduled job.");
//            }
//        }
        if (WaylineTaskTypeEnum.IMMEDIATE.getVal() == waylineJob.getTaskType()) {
            if (!executeFlightTask(waylineJob.getJobId())) {
                return ResponseResult.error("Failed to execute job.");
            }
        }

        if (WaylineTaskTypeEnum.TIMED.getVal() == waylineJob.getTaskType()) {
            boolean isAdd = RedisOpsUtils.zAdd(RedisConst.WAYLINE_JOB_TIMED_EXECUTE,
                     waylineJob.getDockSn() + RedisConst.DELIMITER + waylineJob.getJobId(),
                    waylineJob.getBeginTime().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
            if (!isAdd) {
                return ResponseResult.error("Failed to create scheduled job.");
            }
        }

        return ResponseResult.success();
    }
@@ -319,11 +319,11 @@
//                        .fingerprint(waylineFile.get().getSign())
                        .fingerprint(md5)
                        .build())
                .simulateMission(WaylineSimulateMissionDTO.builder()
                        .isEnable(1)
                        .latitude(46.558831038)
                        .longitude(125.148072319)
                        .build())
//                .simulateMission(WaylineSimulateMissionDTO.builder()
//                        .isEnable(1)
//                        .latitude(46.558831038)
//                        .longitude(125.148072319)
//                        .build())
                .build();

        String topic = TopicConst.THING_MODEL_PRE + TopicConst.PRODUCT +
@@ -351,20 +351,20 @@

        // 飞行命令先注释掉
        // Issue an immediate task execution command.
//        if (WaylineTaskTypeEnum.IMMEDIATE.getVal() == waylineJob.getTaskType()) {
//            if (!executeFlightTask(waylineJob.getJobId())) {
//                return ResponseResult.error("Failed to execute job.");
//            }
//        }
//
//        if (WaylineTaskTypeEnum.TIMED.getVal() == waylineJob.getTaskType()) {
//            boolean isAdd = RedisOpsUtils.zAdd(RedisConst.WAYLINE_JOB_TIMED_EXECUTE,
//                     waylineJob.getDockSn() + RedisConst.DELIMITER + waylineJob.getJobId(),
//                    waylineJob.getBeginTime().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
//            if (!isAdd) {
//                return ResponseResult.error("Failed to create scheduled job.");
//            }
//        }
        if (WaylineTaskTypeEnum.IMMEDIATE.getVal() == waylineJob.getTaskType()) {
            if (!executeFlightTask(waylineJob.getJobId())) {
                return ResponseResult.error("Failed to execute job.");
            }
        }

        if (WaylineTaskTypeEnum.TIMED.getVal() == waylineJob.getTaskType()) {
            boolean isAdd = RedisOpsUtils.zAdd(RedisConst.WAYLINE_JOB_TIMED_EXECUTE,
                     waylineJob.getDockSn() + RedisConst.DELIMITER + waylineJob.getJobId(),
                    waylineJob.getBeginTime().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
            if (!isAdd) {
                return ResponseResult.error("Failed to create scheduled job.");
            }
        }

        return ResponseResult.success();
    }