Commit a2c26944 by gdj

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

parent e8aaa307
...@@ -24,6 +24,13 @@ public class SimulateMission { ...@@ -24,6 +24,13 @@ public class SimulateMission {
@Max(180) @Max(180)
private Float longitude; private Float longitude;
/**
* 高度 {"max":"9999.9","min":"-9999.9"unit_name":"米 / m"}
*/
@Min(-10000)
@Max(10000)
private Double altitude;
public SimulateMission() { public SimulateMission() {
} }
...@@ -33,6 +40,7 @@ public class SimulateMission { ...@@ -33,6 +40,7 @@ public class SimulateMission {
"isEnable=" + isEnable + "isEnable=" + isEnable +
", latitude=" + latitude + ", latitude=" + latitude +
", longitude=" + longitude + ", longitude=" + longitude +
", altitude=" + altitude +
'}'; '}';
} }
...@@ -62,4 +70,14 @@ public class SimulateMission { ...@@ -62,4 +70,14 @@ public class SimulateMission {
this.longitude = longitude; this.longitude = longitude;
return this; return this;
} }
public Double getAltitude() {
return altitude;
}
public SimulateMission setAltitude(Double altitude) {
this.altitude = altitude;
return this;
}
} }
...@@ -95,4 +95,23 @@ public class WaylineJobEntity implements Serializable { ...@@ -95,4 +95,23 @@ public class WaylineJobEntity implements Serializable {
@TableField("org_id") @TableField("org_id")
private String orgId; private String orgId;
/**
* 航线精度类型: 0-GPS任务, 1-高精度RTK任务
*/
@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; package com.dji.sample.wayline.model.param;
import com.dji.sdk.cloudapi.wayline.FlighttaskBreakPoint; import com.dji.sdk.cloudapi.wayline.*;
import com.dji.sdk.cloudapi.wayline.OutOfControlActionEnum;
import com.dji.sdk.cloudapi.wayline.TaskTypeEnum;
import com.dji.sdk.cloudapi.wayline.WaylineTypeEnum;
import lombok.Data; import lombok.Data;
import org.hibernate.validator.constraints.Range; import org.hibernate.validator.constraints.Range;
...@@ -62,4 +59,14 @@ public class CreateJobParam { ...@@ -62,4 +59,14 @@ public class CreateJobParam {
*/ */
private Integer breakPointResumeFlight; private Integer breakPointResumeFlight;
/**
* 航线精度类型 0: GPS任务 1: 高精度RTK任务
*/
private Integer waylinePrecisionType;
/**
* 模拟飞行
*/
private SimulateMission simulateMission;
} }
...@@ -261,6 +261,12 @@ public class FlightTaskServiceImpl extends AbstractWaylineService implements IFl ...@@ -261,6 +261,12 @@ public class FlightTaskServiceImpl extends AbstractWaylineService implements IFl
if (param.getBreakPoint() != null) { if (param.getBreakPoint() != null) {
waylineJob.setBreakPoint(param.getBreakPoint()); 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. // If it is a conditional task type, add conditions to the job parameters.
addConditions(waylineJob, param, beginTime, endTime); addConditions(waylineJob, param, beginTime, endTime);
......
...@@ -133,6 +133,13 @@ public class WaylineJobServiceImpl extends ServiceImpl<IWaylineJobMapper, Waylin ...@@ -133,6 +133,13 @@ public class WaylineJobServiceImpl extends ServiceImpl<IWaylineJobMapper, Waylin
if (param.getBreakPointResumeFlight() != null && param.getBreakPointResumeFlight() == 1) { if (param.getBreakPointResumeFlight() != null && param.getBreakPointResumeFlight() == 1) {
waylineRedisService.setBreakPointWaylineJobDockSn(jobId, param.getDockSn()); 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); 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