From 63e503016c78aac218a4c7f9a765bcbb0b1e398e Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 24 Nov 2025 12:27:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-admin/src/main/java/com/ard/web/controller/sample/wayline/WaylineJobController.java | 16 +++++++++++++---
1 files changed, 13 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 9ab23cb..108f49e 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
@@ -57,9 +57,14 @@
@RequestParam(required = false) Integer taskType,
@RequestParam(required = false) String name,
@RequestParam(required = false) Boolean isComplete) {
+ try {
// 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);
+ PaginationData<WaylineJobDTO> data = waylineJobService.getJobsList(page, pageSize, status, startTime, endTime, taskType, name, isComplete);
+ return ResponseResult.success(data);
+ }
+ catch (Exception e) {
+ return ResponseResult.error(e.getMessage());
+ }
}
/**
@@ -71,7 +76,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