This commit is contained in:
parent
773bec2374
commit
b71daf4818
|
|
@ -78,7 +78,7 @@ public class TaskController extends BaseController
|
|||
* 根据无人机ID查询任务列表
|
||||
*/
|
||||
@GetMapping("/uav/{uavId}")
|
||||
public R<List<com.ruoyi.task.api.domain.TaskDTO>> getTaskByUavId(@PathVariable("uavId") Long uavId)
|
||||
public R<List<com.ruoyi.task.api.domain.TaskDTO>> getTaskByUavId(@PathVariable("uavId") String uavId)
|
||||
{
|
||||
return R.ok(TaskControllerConvert.fromList(taskService.getTaskByUavId(uavId)));
|
||||
}
|
||||
|
|
@ -87,7 +87,7 @@ public class TaskController extends BaseController
|
|||
* 根据无人机ID获取最新的一条任务
|
||||
*/
|
||||
@GetMapping("/uav/current/{uavId}")
|
||||
public R<com.ruoyi.task.api.domain.TaskDTO> getCurrentTaskByUavId(@PathVariable("uavId") Long uavId)
|
||||
public R<com.ruoyi.task.api.domain.TaskDTO> getCurrentTaskByUavId(@PathVariable("uavId") String uavId)
|
||||
{
|
||||
return R.ok(TaskControllerConvert.from(taskService.getCurrentTaskByUavId(uavId)));
|
||||
}
|
||||
|
|
@ -127,7 +127,7 @@ public class TaskController extends BaseController
|
|||
*/
|
||||
@InnerAuth
|
||||
@GetMapping("/inner/uav/{uavId}")
|
||||
public R<List<TaskDTO>> getTaskByUavIdInner(@PathVariable("uavId") Long uavId)
|
||||
public R<List<TaskDTO>> getTaskByUavIdInner(@PathVariable("uavId") String uavId)
|
||||
{
|
||||
return R.ok(TaskControllerConvert.fromList(taskService.getTaskByUavId(uavId)));
|
||||
}
|
||||
|
|
@ -137,7 +137,7 @@ public class TaskController extends BaseController
|
|||
*/
|
||||
@InnerAuth
|
||||
@GetMapping("/inner/uav/current/{uavId}")
|
||||
public R<TaskDTO> getCurrentTaskByUavIdInner(@PathVariable("uavId") Long uavId)
|
||||
public R<TaskDTO> getCurrentTaskByUavIdInner(@PathVariable("uavId") String uavId)
|
||||
{
|
||||
return R.ok(TaskControllerConvert.from(taskService.getCurrentTaskByUavId(uavId)));
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue