From d2b4f1493696c28355242deda4eaa66ceb1ec7d6 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 18 Nov 2025 15:18:07 +0800
Subject: [PATCH] 2025-11-15 zwy 取消任务时，任务状态无法取消返回提示改为中文。
---
ard-admin/src/main/java/com/ard/web/controller/sample/wayline/WaylineJobController.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 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..d4f110b 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);
}
@@ -64,7 +71,12 @@
@ApiOperation("取消航线任务")
@DeleteMapping("/jobs")
public ResponseResult publishCancelJob(@RequestParam(name = "job_id") Set<String> jobIds){
- waylineJobService.cancelFlightTask(jobIds);
+ try{
+ waylineJobService.cancelFlightTask(jobIds);
+ }
+ catch (Exception e){
+ return ResponseResult.error(e.getMessage());
+ }
return ResponseResult.success();
}
--
Gitblit v1.9.3