添加接口
This commit is contained in:
parent
47406bf012
commit
dc4bcea5a9
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue