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

xx

This commit is contained in:
孙小云 2026-03-09 09:58:40 +08:00
parent 773bec2374
commit b71daf4818
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,7 +78,7 @@ public class TaskController extends BaseController
* 根据无人机ID查询任务列表 * 根据无人机ID查询任务列表
*/ */
@GetMapping("/uav/{uavId}") @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))); return R.ok(TaskControllerConvert.fromList(taskService.getTaskByUavId(uavId)));
} }
@ -87,7 +87,7 @@ public class TaskController extends BaseController
* 根据无人机ID获取最新的一条任务 * 根据无人机ID获取最新的一条任务
*/ */
@GetMapping("/uav/current/{uavId}") @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))); return R.ok(TaskControllerConvert.from(taskService.getCurrentTaskByUavId(uavId)));
} }
@ -127,7 +127,7 @@ public class TaskController extends BaseController
*/ */
@InnerAuth @InnerAuth
@GetMapping("/inner/uav/{uavId}") @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))); return R.ok(TaskControllerConvert.fromList(taskService.getTaskByUavId(uavId)));
} }
@ -137,7 +137,7 @@ public class TaskController extends BaseController
*/ */
@InnerAuth @InnerAuth
@GetMapping("/inner/uav/current/{uavId}") @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))); return R.ok(TaskControllerConvert.from(taskService.getCurrentTaskByUavId(uavId)));
} }