Merge remote-tracking branch 'origin/main'

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<AircraftDetailVO> getAircraftDetail(@PathVariable("aircraftId") Long aircraftId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 获取所有机场和机场的无人机
+     *
+     * @param source 请求来源
+     * @return 结果
+     */
+    @GetMapping("/aircraft/dock-aircraft-list")
+    R<List<DockAircraftVO>> getDockAircraftList(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 }

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;
+    }
+}

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<RemoteAirc
             {
                 return R.fail("查看无人机详情失败:" + throwable.getMessage());
             }
+
+            @Override
+            public R<List<DockAircraftVO>> getDockAircraftList(String source)
+            {
+                return R.fail("获取机场无人机列表失败:" + throwable.getMessage());
+            }
         };
     }
 }

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<TaskDTO> getTaskById(@PathVariable("taskId") Long taskId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
-    /**
+//    /**
-     * 查询任务列表
+//     * 查询任务列表
-     *
+//     *
-     * @param queryDTO 查询条件
+//     * @param queryDTO 查询条件
-     * @param source 请求来源
+//     * @param source 请求来源
-     * @return 结果
+//     * @return 结果
-     */
+//     */
-    @PostMapping("/task/list")
+//    @PostMapping("/task/list")
-    R<List<TaskDTO>> getTaskList(@RequestBody TaskQueryDTO queryDTO, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+//    R<List<TaskDTO>> getTaskList(@RequestBody TaskQueryVO queryDTO, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     /**
      * 更新任务

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

ruoyi-api/tuoheng-api-task/src/main/java/com/ruoyi/task/api/domain/TaskStatQueryVO.java

@@ -4,6 +4,9 @@ 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;
+
 /**
  * 任务统计查询DTO
  *
@@ -18,20 +21,26 @@ public class TaskStatQueryVO {
     /** 月份 */
     private Integer month;
 
+    /** 开始日期 */
+    private Date startTime;
+
+    /** 结束日期 */
+    private Date endTime;
+
     /** 任务类别 */
     private TaskCategoryEnum taskCategory;
 
     /** 任务类型 */
     private TaskTypeEnum taskType;
 
-    /** 状态 */
+    /** 状态列表 */
-    private StatusEnum status;
+    private List<StatusEnum> statusList;
 
-    /** 航线ID */
+    /** 航线ID列表 */
-    private Long routeId;
+    private List<Long> routeIdList;
 
-    /** 无人机ID */
+    /** 无人机ID列表 */
-    private String uavId;
+    private List<String> uavIdList;
 
     public Integer getYear() {
         return year;
@@ -49,6 +58,22 @@ public class TaskStatQueryVO {
         this.month = month;
     }
 
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
     public TaskCategoryEnum getTaskCategory() {
         return taskCategory;
     }
@@ -65,27 +90,27 @@ public class TaskStatQueryVO {
         this.taskType = taskType;
     }
 
-    public StatusEnum getStatus() {
+    public List<StatusEnum> getStatusList() {
-        return status;
+        return statusList;
     }
 
-    public void setStatus(StatusEnum status) {
+    public void setStatusList(List<StatusEnum> statusList) {
-        this.status = status;
+        this.statusList = statusList;
     }
 
-    public Long getRouteId() {
+    public List<Long> getRouteIdList() {
-        return routeId;
+        return routeIdList;
     }
 
-    public void setRouteId(Long routeId) {
+    public void setRouteIdList(List<Long> routeIdList) {
-        this.routeId = routeId;
+        this.routeIdList = routeIdList;
     }
 
-    public String getUavId() {
+    public List<String> getUavIdList() {
-        return uavId;
+        return uavIdList;
     }
 
-    public void setUavId(String uavId) {
+    public void setUavIdList(List<String> uavIdList) {
-        this.uavId = uavId;
+        this.uavIdList = uavIdList;
     }
 }

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;
@@ -47,10 +47,10 @@ public class RemoteTaskFallbackFactory implements FallbackFactory<RemoteTaskServ
                 return R.fail("获取任务失败");
             }
 
-            @Override
+//            @Override
-            public R<List<TaskDTO>> getTaskList(TaskQueryDTO queryDTO, String source) {
+//            public R<List<TaskDTO>> getTaskList(TaskQueryVO queryDTO, String source) {
-                return R.ok(Collections.emptyList());
+//                return R.ok(Collections.emptyList());
-            }
+//            }
 
             @Override
             public R<Boolean> updateTask(TaskDTO taskDTO, String source) {