From f31d3fe7366c7f852a896aae1a4b9da6bad17e88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= <sunpengchina85@gmail.com>
Date: Fri, 13 Mar 2026 10:52:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../convert/TaskStatControllerConvert.java         |  2 +-
 .../task/service/dto/TaskStatQueryServiceDTO.java  | 12 ++++++------
 .../ruoyi/task/service/impl/TaskServiceImpl.java   | 14 ++++++++++++--
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/ruoyi/task/controller/convert/TaskStatControllerConvert.java b/src/main/java/com/ruoyi/task/controller/convert/TaskStatControllerConvert.java
index 1ad3fe6..d65c725 100644
--- a/src/main/java/com/ruoyi/task/controller/convert/TaskStatControllerConvert.java
+++ b/src/main/java/com/ruoyi/task/controller/convert/TaskStatControllerConvert.java
@@ -29,7 +29,7 @@ public class TaskStatControllerConvert {
         dto.setTaskType(apiDTO.getTaskType());
         dto.setStatusList(apiDTO.getStatusList());
         dto.setRouteIdList(apiDTO.getRouteIdList());
-        dto.setUavId(apiDTO.getUavId());
+        dto.setUavIdList(apiDTO.getUavIdList());
         return dto;
     }
 
diff --git a/src/main/java/com/ruoyi/task/service/dto/TaskStatQueryServiceDTO.java b/src/main/java/com/ruoyi/task/service/dto/TaskStatQueryServiceDTO.java
index c5c4d3d..a509420 100644
--- a/src/main/java/com/ruoyi/task/service/dto/TaskStatQueryServiceDTO.java
+++ b/src/main/java/com/ruoyi/task/service/dto/TaskStatQueryServiceDTO.java
@@ -32,8 +32,8 @@ public class TaskStatQueryServiceDTO {
     /** 航线ID列表 */
     private List<Long> routeIdList;
 
-    /** 无人机ID */
-    private String uavId;
+    /** 无人机ID列表 */
+    private List<String> uavIdList;
 
     public Integer getYear() {
         return year;
@@ -83,11 +83,11 @@ public class TaskStatQueryServiceDTO {
         this.routeIdList = routeIdList;
     }
 
-    public String getUavId() {
-        return uavId;
+    public List<String> getUavIdList() {
+        return uavIdList;
     }
 
-    public void setUavId(String uavId) {
-        this.uavId = uavId;
+    public void setUavIdList(List<String> uavIdList) {
+        this.uavIdList = uavIdList;
     }
 }
diff --git a/src/main/java/com/ruoyi/task/service/impl/TaskServiceImpl.java b/src/main/java/com/ruoyi/task/service/impl/TaskServiceImpl.java
index cd270cc..eb58b02 100644
--- a/src/main/java/com/ruoyi/task/service/impl/TaskServiceImpl.java
+++ b/src/main/java/com/ruoyi/task/service/impl/TaskServiceImpl.java
@@ -193,7 +193,6 @@ public class TaskServiceImpl implements ITaskService {
     @Override
     public TaskStatByYearServiceDTO getTaskStatByYear(TaskStatQueryServiceDTO queryDTO) {
         Task task = new Task();
-        task.setUavId(queryDTO.getUavId());
         task.setTaskCategory(queryDTO.getTaskCategory());
         task.setTaskType(queryDTO.getTaskType());
 
@@ -217,6 +216,12 @@ public class TaskServiceImpl implements ITaskService {
                     continue;
                 }
 
+                // 如果指定了无人机ID列表，则过滤无人机
+                if (queryDTO.getUavIdList() != null && !queryDTO.getUavIdList().isEmpty()
+                    && !queryDTO.getUavIdList().contains(t.getUavId())) {
+                    continue;
+                }
+
                 calendar.setTime(t.getStartTime());
                 int year = calendar.get(Calendar.YEAR);
                 if (year == queryDTO.getYear()) {
@@ -236,7 +241,6 @@ public class TaskServiceImpl implements ITaskService {
     @Override
     public TaskStatByMonthServiceDTO getTaskStatByMonth(TaskStatQueryServiceDTO queryDTO) {
         Task task = new Task();
-        task.setUavId(queryDTO.getUavId());
         task.setTaskCategory(queryDTO.getTaskCategory());
         task.setTaskType(queryDTO.getTaskType());
 
@@ -260,6 +264,12 @@ public class TaskServiceImpl implements ITaskService {
                     continue;
                 }
 
+                // 如果指定了无人机ID列表，则过滤无人机
+                if (queryDTO.getUavIdList() != null && !queryDTO.getUavIdList().isEmpty()
+                    && !queryDTO.getUavIdList().contains(t.getUavId())) {
+                    continue;
+                }
+
                 calendar.setTime(t.getStartTime());
                 int year = calendar.get(Calendar.YEAR);
                 int month = calendar.get(Calendar.MONTH) + 1;