diff --git a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/RemoteTaskService.java b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/RemoteTaskService.java index 63142dd..ae7ec78 100644 --- a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/RemoteTaskService.java +++ b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/RemoteTaskService.java @@ -90,7 +90,7 @@ public interface RemoteTaskService * @return 结果 */ @GetMapping("/task/uav/{uavId}") - R> getTaskByUavId(@PathVariable("uavId") Long uavId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + R> getTaskByUavId(@PathVariable("uavId") String uavId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); /** * 根据无人机ID获取最新的一条任务 @@ -100,7 +100,7 @@ public interface RemoteTaskService * @return 结果 */ @GetMapping("/task/uav/current/{uavId}") - R getCurrentTaskByUavId(@PathVariable("uavId") Long uavId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + R getCurrentTaskByUavId(@PathVariable("uavId") String uavId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); diff --git a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/factory/RemoteTaskFallbackFactory.java b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/factory/RemoteTaskFallbackFactory.java index c1245d1..2e4b4ef 100644 --- a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/factory/RemoteTaskFallbackFactory.java +++ b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/factory/RemoteTaskFallbackFactory.java @@ -63,12 +63,12 @@ public class RemoteTaskFallbackFactory implements FallbackFactory> getTaskByUavId(Long uavId, String source) { + public R> getTaskByUavId(String uavId, String source) { return R.ok(Collections.emptyList()); } @Override - public R getCurrentTaskByUavId(Long uavId, String source) { + public R getCurrentTaskByUavId(String uavId, String source) { return R.fail("获取最新任务失败"); }