Commit 074e9157 by gdj

飞行任务增加草莓自定义流程参数。

parent b0e3661d
package com.dji.sdk.cloudapi.wayline;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
/**
* 草莓机场自定义流程
* @author guan
*/
public class CustomProcess implements Serializable {
@NotNull
private String processId;
private String name;
// 其他自定义参数 实际增加
@Override
public String toString() {
return "CustomProcess{" +
"processId=" + processId +
", name=" + name +
'}';
}
public String getProcessId() {
return processId;
}
public void setProcessId(String processId) {
this.processId = processId;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
}
...@@ -110,6 +110,11 @@ public class FlighttaskPrepareRequest extends BaseModel { ...@@ -110,6 +110,11 @@ public class FlighttaskPrepareRequest extends BaseModel {
@CloudSDKVersion(since = CloudSDKVersionEnum.V1_0_1, include = GatewayTypeEnum.DOCK2) @CloudSDKVersion(since = CloudSDKVersionEnum.V1_0_1, include = GatewayTypeEnum.DOCK2)
private WaylinePrecisionTypeEnum waylinePrecisionType; private WaylinePrecisionTypeEnum waylinePrecisionType;
/**
* 草莓自定义流程
*/
private CustomProcess customProcess;
public FlighttaskPrepareRequest() {} public FlighttaskPrepareRequest() {}
@Override @Override
...@@ -129,6 +134,7 @@ public class FlighttaskPrepareRequest extends BaseModel { ...@@ -129,6 +134,7 @@ public class FlighttaskPrepareRequest extends BaseModel {
", rthMode=" + rthMode + ", rthMode=" + rthMode +
", simulateMission=" + simulateMission + ", simulateMission=" + simulateMission +
", waylinePrecisionType=" + waylinePrecisionType + ", waylinePrecisionType=" + waylinePrecisionType +
", customProcess=" + customProcess +
'}'; '}';
} }
...@@ -249,6 +255,15 @@ public class FlighttaskPrepareRequest extends BaseModel { ...@@ -249,6 +255,15 @@ public class FlighttaskPrepareRequest extends BaseModel {
return this; return this;
} }
public CustomProcess getCustomProcess() {
return customProcess;
}
public FlighttaskPrepareRequest setCustomProcess(CustomProcess customProcess) {
this.customProcess = customProcess;
return this;
}
public WaylinePrecisionTypeEnum getWaylinePrecisionType() { public WaylinePrecisionTypeEnum getWaylinePrecisionType() {
return waylinePrecisionType; return waylinePrecisionType;
} }
......
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.cloudapi.wayline.OutOfControlActionEnum; import com.dji.sdk.cloudapi.wayline.OutOfControlActionEnum;
import com.dji.sdk.cloudapi.wayline.TaskTypeEnum; import com.dji.sdk.cloudapi.wayline.TaskTypeEnum;
import com.dji.sdk.cloudapi.wayline.WaylineTypeEnum; import com.dji.sdk.cloudapi.wayline.WaylineTypeEnum;
...@@ -75,4 +76,9 @@ public class WaylineJobDTO { ...@@ -75,4 +76,9 @@ public class WaylineJobDTO {
*/ */
private TaskSceneEnum taskScene; private TaskSceneEnum taskScene;
/**
* 草莓机场自定义流程
*/
private CustomProcess customProcess;
} }
...@@ -333,6 +333,9 @@ public class FlightTaskServiceImpl extends AbstractWaylineService implements IFl ...@@ -333,6 +333,9 @@ public class FlightTaskServiceImpl extends AbstractWaylineService implements IFl
.setFile(new FlighttaskFile() .setFile(new FlighttaskFile()
.setUrl(url.toString()) .setUrl(url.toString())
.setFingerprint(waylineFile.get().getSign())); .setFingerprint(waylineFile.get().getSign()));
if (waylineJob.getCustomProcess() != null) {
flightTask.setCustomProcess(waylineJob.getCustomProcess());
}
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