From 72b111b13f6b23fc2014c61fa2acbf857968b54c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Fri, 13 Mar 2026 09:15:15 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/task/api/domain/TaskStatQueryVO.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatQueryVO.java b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatQueryVO.java index 4131021..42dfbd6 100644 --- a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatQueryVO.java +++ b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatQueryVO.java @@ -4,6 +4,8 @@ import com.ruoyi.task.api.enums.StatusEnum; import com.ruoyi.task.api.enums.TaskCategoryEnum; import com.ruoyi.task.api.enums.TaskTypeEnum; +import java.util.List; + /** * 任务统计查询DTO * @@ -24,8 +26,8 @@ public class TaskStatQueryVO { /** 任务类型 */ private TaskTypeEnum taskType; - /** 状态 */ - private StatusEnum status; + /** 状态列表 */ + private List statusList; /** 航线ID */ private Long routeId; @@ -65,12 +67,12 @@ public class TaskStatQueryVO { this.taskType = taskType; } - public StatusEnum getStatus() { - return status; + public List getStatusList() { + return statusList; } - public void setStatus(StatusEnum status) { - this.status = status; + public void setStatusList(List statusList) { + this.statusList = statusList; } public Long getRouteId() { From 48f53231c9731dcd3ecf339749f2a7760faf64ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Fri, 13 Mar 2026 09:37:16 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/api/RemoteAircraftService.java | 12 ++++++ .../device/api/domain/DockAircraftVO.java | 43 +++++++++++++++++++ .../RemoteAircraftFallbackFactory.java | 9 ++++ 3 files changed, 64 insertions(+) create mode 100644 ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockAircraftVO.java diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/RemoteAircraftService.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/RemoteAircraftService.java index bd2fd87..e0a6f2a 100644 --- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/RemoteAircraftService.java +++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/RemoteAircraftService.java @@ -4,10 +4,13 @@ import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.constant.ServiceNameConstants; import com.ruoyi.common.core.domain.R; import com.ruoyi.device.api.domain.AircraftDetailVO; +import com.ruoyi.device.api.domain.DockAircraftVO; import com.ruoyi.device.api.factory.RemoteAircraftFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * 无人机服务 * @@ -26,4 +29,13 @@ public interface RemoteAircraftService */ @GetMapping("/aircraft/detail/{aircraftId}") R getAircraftDetail(@PathVariable("aircraftId") Long aircraftId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + + /** + * 获取所有机场和机场的无人机 + * + * @param source 请求来源 + * @return 结果 + */ + @GetMapping("/aircraft/dock-aircraft-list") + R> getDockAircraftList(@RequestHeader(SecurityConstants.FROM_SOURCE) String source); } diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockAircraftVO.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockAircraftVO.java new file mode 100644 index 0000000..a30ac89 --- /dev/null +++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockAircraftVO.java @@ -0,0 +1,43 @@ +package com.ruoyi.device.api.domain; + +/** + * 机场无人机VO + * + * @author ruoyi + * @date 2026-03-13 + */ +public class DockAircraftVO { + + /** 无人机设备SN */ + private String deviceSn; + + /** 无人机名称 */ + private String aircraftName; + + /** 机场名称 */ + private String dockName; + + public String getDeviceSn() { + return deviceSn; + } + + public void setDeviceSn(String deviceSn) { + this.deviceSn = deviceSn; + } + + public String getAircraftName() { + return aircraftName; + } + + public void setAircraftName(String aircraftName) { + this.aircraftName = aircraftName; + } + + public String getDockName() { + return dockName; + } + + public void setDockName(String dockName) { + this.dockName = dockName; + } +} diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/factory/RemoteAircraftFallbackFactory.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/factory/RemoteAircraftFallbackFactory.java index 48f7243..21ba66b 100644 --- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/factory/RemoteAircraftFallbackFactory.java +++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/factory/RemoteAircraftFallbackFactory.java @@ -3,11 +3,14 @@ package com.ruoyi.device.api.factory; import com.ruoyi.common.core.domain.R; import com.ruoyi.device.api.RemoteAircraftService; import com.ruoyi.device.api.domain.AircraftDetailVO; +import com.ruoyi.device.api.domain.DockAircraftVO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.stereotype.Component; +import java.util.List; + /** * 无人机服务降级处理 * @@ -30,6 +33,12 @@ public class RemoteAircraftFallbackFactory implements FallbackFactory> getDockAircraftList(String source) + { + return R.fail("获取机场无人机列表失败:" + throwable.getMessage()); + } }; } } From 1290d6a52483b6186acbf2d2d88b21d10202990f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Fri, 13 Mar 2026 10:27:24 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/task/api/domain/TaskStatQueryVO.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatQueryVO.java b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatQueryVO.java index 42dfbd6..7d130ae 100644 --- a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatQueryVO.java +++ b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatQueryVO.java @@ -29,8 +29,8 @@ public class TaskStatQueryVO { /** 状态列表 */ private List statusList; - /** 航线ID */ - private Long routeId; + /** 航线ID列表 */ + private List routeIdList; /** 无人机ID */ private String uavId; @@ -75,12 +75,12 @@ public class TaskStatQueryVO { this.statusList = statusList; } - public Long getRouteId() { - return routeId; + public List getRouteIdList() { + return routeIdList; } - public void setRouteId(Long routeId) { - this.routeId = routeId; + public void setRouteIdList(List routeIdList) { + this.routeIdList = routeIdList; } public String getUavId() { From aae9c3537e0b3db2243841a8b9d679febe9d96a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Fri, 13 Mar 2026 10:52:19 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/task/api/domain/TaskStatQueryVO.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatQueryVO.java b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatQueryVO.java index 7d130ae..c174bba 100644 --- a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatQueryVO.java +++ b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatQueryVO.java @@ -32,8 +32,8 @@ public class TaskStatQueryVO { /** 航线ID列表 */ private List routeIdList; - /** 无人机ID */ - private String uavId; + /** 无人机ID列表 */ + private List uavIdList; public Integer getYear() { return year; @@ -83,11 +83,11 @@ public class TaskStatQueryVO { this.routeIdList = routeIdList; } - public String getUavId() { - return uavId; + public List getUavIdList() { + return uavIdList; } - public void setUavId(String uavId) { - this.uavId = uavId; + public void setUavIdList(List uavIdList) { + this.uavIdList = uavIdList; } } \ No newline at end of file From 67c071c99710c3a5f189158c06bbd399f3b299d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Fri, 13 Mar 2026 11:44:07 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E8=B1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/task/api/RemoteTaskService.java | 20 ++++++++-------- .../{TaskQueryDTO.java => TaskQueryVO.java} | 2 +- .../task/api/domain/TaskStatQueryVO.java | 23 +++++++++++++++++++ .../factory/RemoteTaskFallbackFactory.java | 4 ++-- 4 files changed, 36 insertions(+), 13 deletions(-) rename ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/{TaskQueryDTO.java => TaskQueryVO.java} (96%) 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 ae7ec78..9f0bc54 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 @@ -4,7 +4,7 @@ import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.constant.ServiceNameConstants; import com.ruoyi.common.core.domain.R; import com.ruoyi.task.api.domain.TaskDTO; -import com.ruoyi.task.api.domain.TaskQueryDTO; +import com.ruoyi.task.api.domain.TaskQueryVO; import com.ruoyi.task.api.domain.TaskTempVO; import com.ruoyi.task.api.enums.StatusEnum; import com.ruoyi.task.api.factory.RemoteTaskFallbackFactory; @@ -52,15 +52,15 @@ public interface RemoteTaskService @GetMapping("/task/{taskId}") R getTaskById(@PathVariable("taskId") Long taskId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); - /** - * 查询任务列表 - * - * @param queryDTO 查询条件 - * @param source 请求来源 - * @return 结果 - */ - @PostMapping("/task/list") - R> getTaskList(@RequestBody TaskQueryDTO queryDTO, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); +// /** +// * 查询任务列表 +// * +// * @param queryDTO 查询条件 +// * @param source 请求来源 +// * @return 结果 +// */ +// @PostMapping("/task/list") +// R> getTaskList(@RequestBody TaskQueryVO queryDTO, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); /** * 更新任务 diff --git a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskQueryDTO.java b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskQueryVO.java similarity index 96% rename from ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskQueryDTO.java rename to ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskQueryVO.java index 304b318..f509d10 100644 --- a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskQueryDTO.java +++ b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskQueryVO.java @@ -13,7 +13,7 @@ import java.util.Date; * @date 2026-03-06 */ @Data -public class TaskQueryDTO { +public class TaskQueryVO { /** * 任务ID diff --git a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatQueryVO.java b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatQueryVO.java index c174bba..5e65f30 100644 --- a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatQueryVO.java +++ b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatQueryVO.java @@ -4,6 +4,7 @@ import com.ruoyi.task.api.enums.StatusEnum; import com.ruoyi.task.api.enums.TaskCategoryEnum; import com.ruoyi.task.api.enums.TaskTypeEnum; +import java.util.Date; import java.util.List; /** @@ -20,6 +21,12 @@ public class TaskStatQueryVO { /** 月份 */ private Integer month; + /** 开始日期 */ + private Date startDate; + + /** 结束日期 */ + private Date endDate; + /** 任务类别 */ private TaskCategoryEnum taskCategory; @@ -51,6 +58,22 @@ public class TaskStatQueryVO { this.month = month; } + public Date getStartDate() { + return startDate; + } + + public void setStartDate(Date startDate) { + this.startDate = startDate; + } + + public Date getEndDate() { + return endDate; + } + + public void setEndDate(Date endDate) { + this.endDate = endDate; + } + public TaskCategoryEnum getTaskCategory() { return taskCategory; } 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 2e4b4ef..43ae5ef 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 @@ -3,7 +3,7 @@ package com.ruoyi.task.api.factory; import com.ruoyi.common.core.domain.R; import com.ruoyi.task.api.RemoteTaskService; import com.ruoyi.task.api.domain.TaskDTO; -import com.ruoyi.task.api.domain.TaskQueryDTO; +import com.ruoyi.task.api.domain.TaskQueryVO; import com.ruoyi.task.api.domain.TaskTempVO; import com.ruoyi.task.api.enums.StatusEnum; import org.slf4j.Logger; @@ -48,7 +48,7 @@ public class RemoteTaskFallbackFactory implements FallbackFactory> getTaskList(TaskQueryDTO queryDTO, String source) { + public R> getTaskList(TaskQueryVO queryDTO, String source) { return R.ok(Collections.emptyList()); } From 6318ffae9297ecda5a4287b6685c62c99e0ddb04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Fri, 13 Mar 2026 11:48:01 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/task/api/factory/RemoteTaskFallbackFactory.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 43ae5ef..f80d5e3 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 @@ -47,10 +47,10 @@ public class RemoteTaskFallbackFactory implements FallbackFactory> getTaskList(TaskQueryVO queryDTO, String source) { - return R.ok(Collections.emptyList()); - } +// @Override +// public R> getTaskList(TaskQueryVO queryDTO, String source) { +// return R.ok(Collections.emptyList()); +// } @Override public R updateTask(TaskDTO taskDTO, String source) { From a8ff1cbd7c0571677b7a25b924e3b8642c327795 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Fri, 13 Mar 2026 11:53:03 +0800 Subject: [PATCH 7/7] xx --- .../task/api/domain/TaskStatQueryVO.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatQueryVO.java b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatQueryVO.java index 5e65f30..34b8b02 100644 --- a/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatQueryVO.java +++ b/ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatQueryVO.java @@ -22,10 +22,10 @@ public class TaskStatQueryVO { private Integer month; /** 开始日期 */ - private Date startDate; + private Date startTime; /** 结束日期 */ - private Date endDate; + private Date endTime; /** 任务类别 */ private TaskCategoryEnum taskCategory; @@ -58,20 +58,20 @@ public class TaskStatQueryVO { this.month = month; } - public Date getStartDate() { - return startDate; + public Date getStartTime() { + return startTime; } - public void setStartDate(Date startDate) { - this.startDate = startDate; + public void setStartTime(Date startTime) { + this.startTime = startTime; } - public Date getEndDate() { - return endDate; + public Date getEndTime() { + return endTime; } - public void setEndDate(Date endDate) { - this.endDate = endDate; + public void setEndTime(Date endTime) { + this.endTime = endTime; } public TaskCategoryEnum getTaskCategory() {