Commit 65ddd2af by gdj

修改模拟飞行, 增加模拟高度。

parent b09d84d4
......@@ -24,6 +24,13 @@ public class SimulateMission {
@Max(180)
private Float longitude;
/**
* 高度 {"max":"9999.9","min":"-9999.9"unit_name":"米 / m"}
*/
@Min(-10000)
@Max(10000)
private Double altitude;
public SimulateMission() {
}
......@@ -33,6 +40,7 @@ public class SimulateMission {
"isEnable=" + isEnable +
", latitude=" + latitude +
", longitude=" + longitude +
", altitude=" + altitude +
'}';
}
......@@ -62,4 +70,14 @@ public class SimulateMission {
this.longitude = longitude;
return this;
}
public Double getAltitude() {
return altitude;
}
public SimulateMission setAltitude(Double altitude) {
this.altitude = altitude;
return this;
}
}
......@@ -100,5 +100,18 @@ public class WaylineJobEntity implements Serializable {
*/
@TableField("wayline_precision_type")
private Integer waylinePrecisionType;
// 模拟飞行
@TableField("is_simulate_mission")
private Integer isSimulateMission;
@TableField("simulate_mission_latitude")
private Double simulateMissionLatitude;
@TableField("simulate_mission_longitude")
private Double simulateMissionLongitude;
@TableField("simulate_mission_altitude")
private Double simulateMissionAltitude;
}
package com.dji.sample.wayline.model.param;
import com.dji.sdk.cloudapi.wayline.FlighttaskBreakPoint;
import com.dji.sdk.cloudapi.wayline.OutOfControlActionEnum;
import com.dji.sdk.cloudapi.wayline.TaskTypeEnum;
import com.dji.sdk.cloudapi.wayline.WaylineTypeEnum;
import com.dji.sdk.cloudapi.wayline.*;
import lombok.Data;
import org.hibernate.validator.constraints.Range;
......@@ -67,4 +64,9 @@ public class CreateJobParam {
*/
private Integer waylinePrecisionType;
/**
* 模拟飞行
*/
private SimulateMission simulateMission;
}
......@@ -261,6 +261,12 @@ public class FlightTaskServiceImpl extends AbstractWaylineService implements IFl
if (param.getBreakPoint() != null) {
waylineJob.setBreakPoint(param.getBreakPoint());
}
/**
* 模拟飞行
*/
if (param.getSimulateMission() != null) {
waylineJob.setSimulateMission(param.getSimulateMission());
}
// If it is a conditional task type, add conditions to the job parameters.
addConditions(waylineJob, param, beginTime, endTime);
......
......@@ -134,6 +134,13 @@ public class WaylineJobServiceImpl extends ServiceImpl<IWaylineJobMapper, Waylin
if (param.getBreakPointResumeFlight() != null && param.getBreakPointResumeFlight() == 1) {
waylineRedisService.setBreakPointWaylineJobDockSn(jobId, param.getDockSn());
}
// 模拟飞行
if (param.getSimulateMission() != null) {
jobEntity.setIsSimulateMission(param.getSimulateMission().getIsEnable().getState());
jobEntity.setSimulateMissionLatitude(Double.valueOf(param.getSimulateMission().getLatitude()));
jobEntity.setSimulateMissionLongitude(Double.valueOf(param.getSimulateMission().getLongitude()));
jobEntity.setSimulateMissionAltitude(param.getSimulateMission().getAltitude());
}
return insertWaylineJob(jobEntity);
}
......
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