THENG
/
a-tuoheng-device
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改一键起飞命令

This commit is contained in:
孙小云 2026-03-19 08:35:39 +08:00
parent 1ae7289fda
commit d2a6edead8
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/ruoyi/device/controller/AircraftFlyController.java
View File

@ -2,6 +2,7 @@ package com.ruoyi.device.controller;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.device.api.domain.*; import com.ruoyi.device.api.domain.*;
import com.ruoyi.device.api.enums.DroneCurrentStatusEnum; import com.ruoyi.device.api.enums.DroneCurrentStatusEnum;
@ -243,16 +244,20 @@ public class AircraftFlyController extends BaseController
* @param request 起飞请求对象 * @param request 起飞请求对象
* @return 起飞响应 * @return 起飞响应
*/ */
@Operation(summary = "无人机一键起飞", description = "控制指定机场的无人机执行起飞操作") @Operation(summary = "无人机航线任务（一键起飞用的也是该接口）", description = "控制指定机场的无人机执行起飞操作")
@PostMapping("/takeoff") @PostMapping("/takeoff")
public R<String> takeoff(@RequestBody DroneTakeoffRequest request) public R<String> takeoff(@RequestBody DroneTakeoffRequest request)
{ {
// Long taskId = flightService.createClickTakeOffTask(request.getSn(),airlineFileUrl); // Long taskId = flightService.createClickTakeOffTask(request.getSn(),airlineFileUrl);
log.info("一键起飞,生成一键起飞任务 {} ", JSON.toJSONString(request)); log.info("无人机航线任务（一键起飞用的也是该接口） {} ", JSON.toJSONString(request));
try { try {
java.util.Map<String, Object> params = new java.util.HashMap<>(); java.util.Map<String, Object> params = new java.util.HashMap<>();
params.put("airlineFileUrl", airlineFileUrl); if(StringUtils.isEmpty(request.getAirlineFileUrl())){
params.put("airlineFileUrl", airlineFileUrl);
}else {
params.put("airlineFileUrl", request.getAirlineFileUrl());
}
params.put("flyBatteryMin", request.getFlyBatteryMin()); params.put("flyBatteryMin", request.getFlyBatteryMin());
params.put("messageID", request.getTaskId()); params.put("messageID", request.getTaskId());
CompletableFuture<CommandResult> future = machineCommandManager.executeCommand(request.getSn(), CommandType.TAKE_OFF, params); CompletableFuture<CommandResult> future = machineCommandManager.executeCommand(request.getSn(), CommandType.TAKE_OFF, params);