From dc4bcea5a93738c7339b504e408cdcd3306ee2b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Thu, 19 Mar 2026 09:52:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/task/controller/TaskController.java | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ruoyi/task/controller/TaskController.java b/src/main/java/com/ruoyi/task/controller/TaskController.java index 88ee13e..b417f3b 100644 --- a/src/main/java/com/ruoyi/task/controller/TaskController.java +++ b/src/main/java/com/ruoyi/task/controller/TaskController.java @@ -3,6 +3,8 @@ package com.ruoyi.task.controller; import com.alibaba.fastjson.JSON; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.device.api.RemoteAircraftFlyService; +import com.ruoyi.device.api.domain.DroneTakeoffRequest; import com.ruoyi.task.api.domain.TaskStatByMonthVO; import com.ruoyi.task.api.domain.TaskStatQueryVO; import com.ruoyi.task.api.domain.TaskVO; @@ -32,6 +34,9 @@ public class TaskController extends BaseController @Autowired private ITaskService taskService; + @Autowired + private RemoteAircraftFlyService remoteAircraftFlyService; + /** * 创建普通-立即任务 */ @@ -40,9 +45,15 @@ public class TaskController extends BaseController { taskVO.setTaskType(TaskTypeEnum.IMMEDIATELY); taskVO.setTaskCategory(TaskCategoryEnum.NORMAL); - log.info("IMMEDIATELY {}", JSON.toJSONString(taskVO)); - + log.info("Create IMMEDIATELY {}", JSON.toJSONString(taskVO)); Long taskId = taskService.createTaskWithoutPlan(TaskControllerConvert.to(taskVO)); + + DroneTakeoffRequest request = new DroneTakeoffRequest(); + request.setTaskId(taskId); + request.setAirlineFileUrl(taskVO.getRouteUrl()); + request.setSn(taskVO.getUavId()); + log.info("IMMEDIATELY {}", JSON.toJSONString(request)); + remoteAircraftFlyService.takeoff(request); return R.ok(taskId); } @@ -51,9 +62,15 @@ public class TaskController extends BaseController { taskVO.setTaskType(TaskTypeEnum.ONE_CLICK); taskVO.setTaskCategory(TaskCategoryEnum.MANUAL); - log.info("ONE_CLICK {}", JSON.toJSONString(taskVO)); - + log.info("Create ONE_CLICK {}", JSON.toJSONString(taskVO)); Long taskId = taskService.createTaskWithoutPlan(TaskControllerConvert.to(taskVO)); + + DroneTakeoffRequest request = new DroneTakeoffRequest(); + request.setTaskId(taskId); + request.setAirlineFileUrl(taskVO.getRouteUrl()); + request.setSn(taskVO.getUavId()); + log.info("ONE_CLICK {}", JSON.toJSONString(request)); + remoteAircraftFlyService.takeoff(request); return R.ok(taskId); }