From 0aa306b8a99266d7da2f34f94759a5f4ba13663e Mon Sep 17 00:00:00 2001 From: sdy Date: Wed, 27 May 2026 13:29:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E5=8F=91=E8=88=AA=E7=BA=BF=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/service/impl/RouteFlightServiceImpl.java | 6 ++++++ .../main/java/com/multictrl/modules/sys/dto/SysUserDTO.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/admin/src/main/java/com/multictrl/modules/business/service/impl/RouteFlightServiceImpl.java b/admin/src/main/java/com/multictrl/modules/business/service/impl/RouteFlightServiceImpl.java index 89f0c67..f7009ed 100644 --- a/admin/src/main/java/com/multictrl/modules/business/service/impl/RouteFlightServiceImpl.java +++ b/admin/src/main/java/com/multictrl/modules/business/service/impl/RouteFlightServiceImpl.java @@ -104,8 +104,14 @@ public class RouteFlightServiceImpl implements RouteFlightService { flightTaskPrepare.setFile(fileInfo); //获取断点，如果断点续飞请设置 // flightTaskPrepare.setBreak_point(null); + flightTaskPrepare.setRth_mode(1); flightTaskPrepare.setRth_altitude((int) Math.round(globalRthHeight)); + //{"0":"返航","1":"悬停","2":"降落"} + //失控动作，当前固定传的值是 0，即返航。注意该枚举值定义跟飞控跟机场定义的不一致，机场端会进行转换。 + flightTaskPrepare.setOut_of_control_action(0); flightTaskPrepare.setExit_wayline_when_rc_lost(exitOnRcLost); + //{"0":"GPS 任务","1":"高精度 RTK 任务"} + flightTaskPrepare.setWayline_precision_type(1); //模拟器执行 if (flightExecute.getSimulateMission() != null) { flightTaskPrepare.setSimulate_mission(flightExecute.getSimulateMission()); diff --git a/admin/src/main/java/com/multictrl/modules/sys/dto/SysUserDTO.java b/admin/src/main/java/com/multictrl/modules/sys/dto/SysUserDTO.java index 3cd5f1c..c297132 100644 --- a/admin/src/main/java/com/multictrl/modules/sys/dto/SysUserDTO.java +++ b/admin/src/main/java/com/multictrl/modules/sys/dto/SysUserDTO.java @@ -41,7 +41,7 @@ public class SysUserDTO implements Serializable { private String username; @Schema(title = "密码") - @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) +// @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) @NotBlank(message = "{sysuser.password.require}", groups = AddGroup.class) private String password;