From 3cd13607fe569164f6ab5284558ab8e258852940 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Sat, 15 Nov 2025 15:38:19 +0800
Subject: [PATCH] 2025-11-15 zwy 航线任务模块更改; 1、航线文件从夏吉建航线表中取; 2、修改增加循环任务功能; 3、增加字段及字段注释,对应JSON字段; 4、航线任务列表,增加筛选功能;根据不同条件查询结果。

---
 ard-admin/src/main/java/com/ard/web/controller/sample/wayline/WaylineJobController.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ard-admin/src/main/java/com/ard/web/controller/sample/wayline/WaylineJobController.java b/ard-admin/src/main/java/com/ard/web/controller/sample/wayline/WaylineJobController.java
index f14a80c..9ab23cb 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/sample/wayline/WaylineJobController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/sample/wayline/WaylineJobController.java
@@ -50,8 +50,15 @@
     @ApiOperation("航线任务列表")
     @GetMapping("/jobs")
     public ResponseResult<PaginationData<WaylineJobDTO>> getJobs(@RequestParam(defaultValue = "1") Long page,
-                     @RequestParam(name = "page_size", defaultValue = "10") Long pageSize) {
-        PaginationData<WaylineJobDTO> data = waylineJobService.getJobsByWorkspaceId(page, pageSize);
+                     @RequestParam(name = "page_size", defaultValue = "10") Long pageSize,
+                                                                 @RequestParam(required = false) Integer status,
+                                                                 @RequestParam(required = false) Long startTime,
+                                                                 @RequestParam(required = false) Long endTime,
+                                                                 @RequestParam(required = false) Integer taskType,
+                                                                 @RequestParam(required = false) String name,
+                                                                 @RequestParam(required = false) Boolean isComplete) {
+//        PaginationData<WaylineJobDTO> data = waylineJobService.getJobsByWorkspaceId(page, pageSize);defaultValue
+        PaginationData<WaylineJobDTO> data = waylineJobService.getJobsList(page, pageSize, status,startTime, endTime, taskType,name,isComplete);
         return ResponseResult.success(data);
     }
 

--
Gitblit v1.9.3