diff --git a/src/main/java/com/ruoyi/task/controller/TaskController.java b/src/main/java/com/ruoyi/task/controller/TaskController.java index 7430396..cd1ee19 100644 --- a/src/main/java/com/ruoyi/task/controller/TaskController.java +++ b/src/main/java/com/ruoyi/task/controller/TaskController.java @@ -102,43 +102,5 @@ public class TaskController extends BaseController return R.ok(result); } - /** - * 内部调用 - 获取任务详细信息 - */ - @InnerAuth - @GetMapping(value = "/inner/{taskId}") - public R getTaskByIdInner(@PathVariable("taskId") Long taskId) - { - return R.ok(TaskControllerConvert.from(taskService.getTaskById(taskId))); - } - /** - * 内部调用 - 复杂条件查询任务列表 - */ - @InnerAuth - @PostMapping("/inner/list") - public R> listInner(@RequestBody TaskQueryDTO queryDTO) - { - return R.ok(TaskControllerConvert.fromList(taskService.getTaskList(queryDTO))); - } - - /** - * 内部调用 - 根据无人机ID查询任务列表 - */ - @InnerAuth - @GetMapping("/inner/uav/{uavId}") - public R> getTaskByUavIdInner(@PathVariable("uavId") String uavId) - { - return R.ok(TaskControllerConvert.fromList(taskService.getTaskByUavId(uavId))); - } - - /** - * 内部调用 - 根据无人机ID获取最新的一条任务 - */ - @InnerAuth - @GetMapping("/inner/uav/current/{uavId}") - public R getCurrentTaskByUavIdInner(@PathVariable("uavId") String uavId) - { - return R.ok(TaskControllerConvert.from(taskService.getCurrentTaskByUavId(uavId))); - } } \ No newline at end of file diff --git a/src/main/java/com/ruoyi/task/controller/TaskPlanController.java b/src/main/java/com/ruoyi/task/controller/TaskPlanController.java index 9e3fd04..848052a 100644 --- a/src/main/java/com/ruoyi/task/controller/TaskPlanController.java +++ b/src/main/java/com/ruoyi/task/controller/TaskPlanController.java @@ -86,23 +86,5 @@ public class TaskPlanController extends BaseController return R.ok(result); } - /** - * 内部调用 - 获取任务计划详细信息 - */ - @InnerAuth - @GetMapping(value = "/inner/{planId}") - public R getTaskPlanByIdInner(@PathVariable("planId") Long planId) - { - return R.ok(TaskPlanControllerConvert.from(taskPlanService.getTaskPlanById(planId))); - } - /** - * 内部调用 - 复杂条件查询任务计划列表 - */ - @InnerAuth - @PostMapping("/inner/list") - public R> listInner(@RequestBody TaskPlanQueryDTO queryDTO) - { - return R.ok(TaskPlanControllerConvert.fromList(taskPlanService.getTaskPlanList(TaskPlanQueryControllerConvert.to(queryDTO)))); - } } \ No newline at end of file