From 2aaaaf4598b869085ae35871de018cd35847c232 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Tue, 09 Jul 2024 16:41:39 +0800
Subject: [PATCH] 航线拐点
---
src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 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 589c259..459ddb0 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,6 +143,7 @@
.waylineType(param.getWaylineType().getVal())
.outOfControlAction(param.getOutOfControlAction())
.rthAltitude(param.getRthAltitude())
+ .rthMode(param.getRthMode())
.mediaCount(0)
.build();
if (StringUtils.hasText(param.getJobId())) {
@@ -367,6 +368,7 @@
.taskType(waylineJob.getTaskType())
.waylineType(waylineJob.getWaylineType())
.rthAltitude(waylineJob.getRthAltitude())
+ .rthMode(waylineJob.getRthMode())
.outOfControlAction(waylineJob.getOutOfControlAction())
.file(WaylineTaskFileDTO.builder()
.url(MinioUrlUtils.getUrl(url))
@@ -789,6 +791,12 @@
@Override
public List<String> getJobIds(String jobNames) {
List<String> names = getJobNamesByPartialName(jobNames);
+
+ // 如果 names 列表为空，直接返回空的 jobIdStringList
+ if (names.isEmpty()) {
+ return new ArrayList<>();
+ }
+
// 使用 LambdaQueryWrapper 进行查询
List<Object> jobIdList = mapper.selectObjs(
new LambdaQueryWrapper<WaylineJobEntity>()
@@ -803,6 +811,7 @@
}
return jobIdStringList;
}
+
@Override
public WaylineJobEntity getLatestJob(String workspaceId, WaylineJobQueryParam waylineJobQueryParam) {
@@ -1078,6 +1087,7 @@
WaylineJobDTO.WaylineJobDTOBuilder builder = WaylineJobDTO.builder()
.jobId(entity.getJobId())
+ .reason(ErrorCodeUtil.codeToReason(entity.getErrorCode()))
.jobName(entity.getName())
.fileId(entity.getFileId())
.fileName(waylineFileService.getWaylineByWaylineId(entity.getWorkspaceId(), entity.getFileId())
@@ -1101,6 +1111,7 @@
.taskType(WaylineTaskTypeEnum.find(entity.getTaskType()))
.waylineType(WaylineTemplateTypeEnum.find(entity.getWaylineType()))
.rthAltitude(entity.getRthAltitude())
+ .rthMode(entity.getRthMode())
.outOfControlAction(entity.getOutOfControlAction())
.mediaCount(entity.getMediaCount())
.hasChildren(entity.getHasChildren());
--
Gitblit v1.9.3