下发航线优化
This commit is contained in:
parent
242ea1088b
commit
0aa306b8a9
|
|
@ -104,8 +104,14 @@ public class RouteFlightServiceImpl implements RouteFlightService {
|
||||||
flightTaskPrepare.setFile(fileInfo);
|
flightTaskPrepare.setFile(fileInfo);
|
||||||
//获取断点,如果断点续飞请设置
|
//获取断点,如果断点续飞请设置
|
||||||
// flightTaskPrepare.setBreak_point(null);
|
// flightTaskPrepare.setBreak_point(null);
|
||||||
|
flightTaskPrepare.setRth_mode(1);
|
||||||
flightTaskPrepare.setRth_altitude((int) Math.round(globalRthHeight));
|
flightTaskPrepare.setRth_altitude((int) Math.round(globalRthHeight));
|
||||||
|
//{"0":"返航","1":"悬停","2":"降落"}
|
||||||
|
//失控动作,当前固定传的值是 0,即返航。注意该枚举值定义跟飞控跟机场定义的不一致,机场端会进行转换。
|
||||||
|
flightTaskPrepare.setOut_of_control_action(0);
|
||||||
flightTaskPrepare.setExit_wayline_when_rc_lost(exitOnRcLost);
|
flightTaskPrepare.setExit_wayline_when_rc_lost(exitOnRcLost);
|
||||||
|
//{"0":"GPS 任务","1":"高精度 RTK 任务"}
|
||||||
|
flightTaskPrepare.setWayline_precision_type(1);
|
||||||
//模拟器执行
|
//模拟器执行
|
||||||
if (flightExecute.getSimulateMission() != null) {
|
if (flightExecute.getSimulateMission() != null) {
|
||||||
flightTaskPrepare.setSimulate_mission(flightExecute.getSimulateMission());
|
flightTaskPrepare.setSimulate_mission(flightExecute.getSimulateMission());
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,7 @@ public class SysUserDTO implements Serializable {
|
||||||
private String username;
|
private String username;
|
||||||
|
|
||||||
@Schema(title = "密码")
|
@Schema(title = "密码")
|
||||||
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
|
// @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
|
||||||
@NotBlank(message = "{sysuser.password.require}", groups = AddGroup.class)
|
@NotBlank(message = "{sysuser.password.require}", groups = AddGroup.class)
|
||||||
private String password;
|
private String password;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue