Commit 624d34de by gdj

飞行任务和一键起飞补充模拟飞行参数simulateMission。

parent 074e9157
...@@ -5,6 +5,7 @@ import com.dji.sdk.cloudapi.control.CommanderModeLostActionEnum; ...@@ -5,6 +5,7 @@ import com.dji.sdk.cloudapi.control.CommanderModeLostActionEnum;
import com.dji.sdk.cloudapi.device.ExitWaylineWhenRcLostEnum; import com.dji.sdk.cloudapi.device.ExitWaylineWhenRcLostEnum;
import com.dji.sdk.cloudapi.device.RcLostActionEnum; import com.dji.sdk.cloudapi.device.RcLostActionEnum;
import com.dji.sdk.cloudapi.wayline.RthModeEnum; import com.dji.sdk.cloudapi.wayline.RthModeEnum;
import com.dji.sdk.cloudapi.wayline.SimulateMission;
import lombok.Data; import lombok.Data;
import org.hibernate.validator.constraints.Range; import org.hibernate.validator.constraints.Range;
...@@ -61,4 +62,10 @@ public class TakeoffToPointParam { ...@@ -61,4 +62,10 @@ public class TakeoffToPointParam {
@Min(2) @Min(2)
@Max(3000) @Max(3000)
private Float commanderFlightHeight; private Float commanderFlightHeight;
/**
* 模拟飞行参数
*/
private SimulateMission simulateMission;
} }
package com.dji.sample.wayline.model.dto; package com.dji.sample.wayline.model.dto;
import com.dji.sample.wayline.model.enums.TaskSceneEnum; import com.dji.sample.wayline.model.enums.TaskSceneEnum;
import com.dji.sdk.cloudapi.wayline.CustomProcess; import com.dji.sdk.annotations.CloudSDKVersion;
import com.dji.sdk.cloudapi.wayline.OutOfControlActionEnum; import com.dji.sdk.cloudapi.device.ExitWaylineWhenRcLostEnum;
import com.dji.sdk.cloudapi.wayline.TaskTypeEnum; import com.dji.sdk.cloudapi.wayline.*;
import com.dji.sdk.cloudapi.wayline.WaylineTypeEnum; import com.dji.sdk.config.version.CloudSDKVersionEnum;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
...@@ -81,4 +81,10 @@ public class WaylineJobDTO { ...@@ -81,4 +81,10 @@ public class WaylineJobDTO {
*/ */
private CustomProcess customProcess; private CustomProcess customProcess;
/**
* 是否在模拟器中执行任务
*/
@CloudSDKVersion(since = CloudSDKVersionEnum.V1_0_0)
private SimulateMission simulateMission;
} }
...@@ -336,6 +336,9 @@ public class FlightTaskServiceImpl extends AbstractWaylineService implements IFl ...@@ -336,6 +336,9 @@ public class FlightTaskServiceImpl extends AbstractWaylineService implements IFl
if (waylineJob.getCustomProcess() != null) { if (waylineJob.getCustomProcess() != null) {
flightTask.setCustomProcess(waylineJob.getCustomProcess()); flightTask.setCustomProcess(waylineJob.getCustomProcess());
} }
if (waylineJob.getSimulateMission() != null) {
flightTask.setSimulateMission(waylineJob.getSimulateMission());
}
if (TaskTypeEnum.CONDITIONAL == waylineJob.getTaskType()) { if (TaskTypeEnum.CONDITIONAL == waylineJob.getTaskType()) {
if (Objects.isNull(waylineJob.getConditions())) { if (Objects.isNull(waylineJob.getConditions())) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment