From db7d67e9ef32723d9b397740168e09053d9c2cff Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 27 Feb 2024 15:42:01 +0800
Subject: [PATCH] 根据航线任务id获取航线媒体文件列表
---
src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java b/src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java
index 9ae0776..b138833 100644
--- a/src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java
+++ b/src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java
@@ -143,7 +143,9 @@
.rthAltitude(param.getRthAltitude())
.mediaCount(0)
.build();
-
+ if (StringUtils.hasText(param.getJobId())){
+ jobEntity.setJobId(param.getJobId());
+ }
return insertWaylineJob(jobEntity);
}
@@ -339,10 +341,10 @@
private Boolean prepareFlightTask(WaylineJobDTO waylineJob) throws SQLException {
- boolean isOnline = deviceRedisService.checkDeviceOnline(waylineJob.getDockSn());
+ /*boolean isOnline = deviceRedisService.checkDeviceOnline(waylineJob.getDockSn());
if (!isOnline) {
throw new RuntimeException("设备离线。");
- }
+ }*/
// get wayline file
Optional<WaylineFileDTO> waylineFile = waylineFileService.getWaylineByWaylineId(waylineJob.getWorkspaceId(), waylineJob.getFileId());
@@ -419,7 +421,7 @@
.status(WaylineJobStatusEnum.FAILED.getVal())
.completedTime(LocalDateTime.now())
.code(serviceReply.getResult()).build());
- // The conditional task fails and enters the blocking status.
+ // 条件任务失败，进入阻塞状态。
if (WaylineTaskTypeEnum.CONDITION == job.getTaskType()
&& WaylineErrorCodeEnum.find(serviceReply.getResult()).isBlock()) {
waylineRedisService.setBlockedWaylineJob(job.getDockSn(), jobId);
--
Gitblit v1.9.3