diff --git a/src/main/java/com/ruoyi/device/controller/AircraftFlyController.java b/src/main/java/com/ruoyi/device/controller/AircraftFlyController.java
index e0768f6..de503cf 100644
--- a/src/main/java/com/ruoyi/device/controller/AircraftFlyController.java
+++ b/src/main/java/com/ruoyi/device/controller/AircraftFlyController.java
@@ -247,28 +247,28 @@ public class AircraftFlyController extends BaseController
     public R<String> takeoff(@RequestBody DroneTakeoffRequest request)
     {
 
-        Long taskId = flightService.createClickTakeOffTask(request.getSn(),airlineFileUrl);
+//        Long taskId = flightService.createClickTakeOffTask(request.getSn(),airlineFileUrl);
         log.info("一键起飞,生成一键起飞任务 sn={} ", request.getSn());
         try {
             java.util.Map<String, Object> params = new java.util.HashMap<>();
             params.put("airlineFileUrl", airlineFileUrl);
             params.put("flyBatteryMin", request.getFlyBatteryMin());
-            params.put("messageID", taskId);
+            params.put("messageID", request.getTaskId());
             CompletableFuture<CommandResult> future = machineCommandManager.executeCommand(request.getSn(), CommandType.TAKE_OFF, params);
             CommandResult result = future.get();
 
             if (result.isSuccess()) {
                 log.info("无人机起飞成功: sn={}", request.getSn());
-                flightService.updateFlightStatus(taskId, StatusEnum.RUNNING);
+                flightService.updateFlightStatus(request.getTaskId(), StatusEnum.CHECKING);
                 return R.ok("起飞命令执行成功");
             } else {
                 log.error("无人机起飞失败: sn={}, reason={}", request.getSn(), result.getErrorMessage());
-                flightService.updateFlightStatus(taskId, StatusEnum.FAILED);
+                flightService.updateFlightStatus(request.getTaskId(), StatusEnum.FAILED);
                 return R.fail("起飞命令执行失败: " + result.getErrorMessage());
             }
         } catch (Exception e) {
             log.error("无人机起飞异常: sn={}", request.getSn(), e);
-            flightService.updateFlightStatus(taskId, StatusEnum.FAILED);
+            flightService.updateFlightStatus(request.getTaskId(), StatusEnum.FAILED);
             return R.fail("起飞命令执行异常: " + e.getMessage());
         }
     }
diff --git a/src/main/java/com/ruoyi/device/service/impl/FlightServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/FlightServiceImpl.java
index eede5df..c18b03b 100644
--- a/src/main/java/com/ruoyi/device/service/impl/FlightServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/FlightServiceImpl.java
@@ -10,7 +10,7 @@ import com.ruoyi.device.mapper.entity.FlightLogEntity;
 import com.ruoyi.device.mapper.entity.PreCheckLogEntity;
 import com.ruoyi.device.service.FlightService;
 import com.ruoyi.task.api.RemoteTaskService;
-import com.ruoyi.task.api.domain.TaskDTO;
+import com.ruoyi.task.api.domain.TaskVO;
 import com.ruoyi.task.api.enums.ExecuteTypeEnum;
 import com.ruoyi.task.api.enums.StatusEnum;
 import com.ruoyi.task.api.enums.TaskCategoryEnum;
@@ -18,7 +18,6 @@ import com.ruoyi.task.api.enums.TaskTypeEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 
@@ -46,27 +45,27 @@ public class FlightServiceImpl implements FlightService
 
 
     public Long currentRunningTask(String sn){
-        R<TaskDTO> taskDTOR =  remoteTaskService.getCurrentTaskByUavId(sn,SecurityConstants.INNER);
+        R<TaskVO> taskDTOR =  remoteTaskService.getCurrentTaskByUavId(sn,SecurityConstants.INNER);
         return taskDTOR.getData().getId();
     }
 
    public Long createClickTakeOffTask(String sn, String routeUrl){
-       TaskDTO taskDTO = new TaskDTO();
-       taskDTO.setTaskName("一键起飞");
-       taskDTO.setActualStartTime(new Date());
-       taskDTO.setStartTime(new Date());
+       TaskVO taskVO = new TaskVO();
+       taskVO.setTaskName("一键起飞");
+       taskVO.setActualStartTime(new Date());
+       taskVO.setStartTime(new Date());
 
-       taskDTO.setExecuteType(ExecuteTypeEnum.ONCE);
-       taskDTO.setTaskCategory(TaskCategoryEnum.MANUAL);
-       taskDTO.setTaskType(TaskTypeEnum.ONE_CLICK);
+       taskVO.setExecuteType(ExecuteTypeEnum.ONCE);
+       taskVO.setTaskCategory(TaskCategoryEnum.MANUAL);
+       taskVO.setTaskType(TaskTypeEnum.ONE_CLICK);
 
-       taskDTO.setRouteId(-1L);
-       taskDTO.setUavId(sn);
+       taskVO.setRouteId(-1L);
+       taskVO.setUavId(sn);
 
-       taskDTO.setStatus(StatusEnum.PENDING);
-       taskDTO.setRouteUrl(routeUrl);
+       taskVO.setStatus(StatusEnum.PENDING);
+       taskVO.setRouteUrl(routeUrl);
 
-       R<Long> taskId = remoteTaskService.createTaskWithoutPlan(taskDTO,SecurityConstants.INNER);
+       R<Long> taskId = remoteTaskService.createTaskWithoutPlan(taskVO,SecurityConstants.INNER);
 
        return taskId.getData();
     }