From 1d427f8b485ad3ed405fdc4a0292fcbd811790db Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Thu, 20 Nov 2025 10:13:49 +0800
Subject: [PATCH] 2025-11-20 zwy 飞行命令解掉注释，测试飞行
---
ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java | 73 +++++++++++++++++++++---------------
1 files changed, 43 insertions(+), 30 deletions(-)
diff --git a/ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java
index 5ad9c33..6393940 100644
--- a/ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java
@@ -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();
}
@@ -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();
}
@@ -780,14 +780,27 @@
return null;
}
// 修改航线文件名称，从ard_route_info航线表中取;
+ String fileId = entity.getFileId();
+ String fileName = "";
+ try {
+ if (fileId != null) {
+ ArdRouteInfo ardRouteInfo = _ardRouteInfoService.selectArdRouteInfoById(fileId);
+ if (ardRouteInfo != null) {
+ fileName = Optional.ofNullable(ardRouteInfo.getName()).orElse("");
+ }
+ }
+ }
+ catch (Exception e) {
+ log.info("获取航线名称失败，fileId:{},异常原因：{}", fileId,e.getMessage());
+ fileName = "";
+ }
WaylineJobDTO.WaylineJobDTOBuilder builder = WaylineJobDTO.builder()
.jobId(entity.getJobId())
.jobName(entity.getName())
.fileId(entity.getFileId())
// .fileName(waylineFileService.getWaylineByWaylineId(entity.getFileId())
// .orElse(WaylineFileDTO.builder().build()).getName())
- .fileName(_ardRouteInfoService.selectArdRouteInfoById(entity.getFileId())
- .getName())
+ .fileName(fileName)
.dockSn(entity.getDockSn())
.dockName(deviceService.getDeviceBySn(entity.getDockSn())
.orElse(DeviceDTO.builder().build()).getNickname())
--
Gitblit v1.9.3