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

添加接口

This commit is contained in:
孙小云 2026-03-19 09:52:20 +08:00
parent 47406bf012
commit dc4bcea5a9
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/com/ruoyi/task/controller/TaskController.java
View File

@ -3,6 +3,8 @@ package com.ruoyi.task.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.web.controller.BaseController; 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.TaskStatByMonthVO;
import com.ruoyi.task.api.domain.TaskStatQueryVO; import com.ruoyi.task.api.domain.TaskStatQueryVO;
import com.ruoyi.task.api.domain.TaskVO; import com.ruoyi.task.api.domain.TaskVO;
@ -32,6 +34,9 @@ public class TaskController extends BaseController
@Autowired @Autowired
private ITaskService taskService; private ITaskService taskService;
@Autowired
private RemoteAircraftFlyService remoteAircraftFlyService;
/** /**
* 创建普通-立即任务 * 创建普通-立即任务
*/ */
@ -40,9 +45,15 @@ public class TaskController extends BaseController
{ {
taskVO.setTaskType(TaskTypeEnum.IMMEDIATELY); taskVO.setTaskType(TaskTypeEnum.IMMEDIATELY);
taskVO.setTaskCategory(TaskCategoryEnum.NORMAL); taskVO.setTaskCategory(TaskCategoryEnum.NORMAL);
log.info("IMMEDIATELY {}", JSON.toJSONString(taskVO)); log.info("Create IMMEDIATELY {}", JSON.toJSONString(taskVO));
Long taskId = taskService.createTaskWithoutPlan(TaskControllerConvert.to(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); return R.ok(taskId);
} }
@ -51,9 +62,15 @@ public class TaskController extends BaseController
{ {
taskVO.setTaskType(TaskTypeEnum.ONE_CLICK); taskVO.setTaskType(TaskTypeEnum.ONE_CLICK);
taskVO.setTaskCategory(TaskCategoryEnum.MANUAL); 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)); 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); return R.ok(taskId);
} }