From 97aed6e19bac0fefaaf0270ba94492228ebf0bb1 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 03 Dec 2025 18:43:59 +0800
Subject: [PATCH] 2025-12-03 zwy 删除任务失败时返回错误码,不返回异常。

---
 ard-admin/src/main/java/com/ard/web/controller/sample/wayline/WaylineJobController.java |   11 ++++-------
 1 files changed, 4 insertions(+), 7 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 4eb6b38..a2f6a2c 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
@@ -46,6 +46,9 @@
     @PostMapping("/flight-id")
     public ResponseResult<WaylineJobDTO> getJob(@RequestParam(name = "job_id") String jobId) {
         try {
+            if(jobId == null){
+                return ResponseResult.error("任务ID不能为空");
+            }
             Optional<WaylineJobDTO> waylineJobDTO = waylineJobService.getJobByJobId(jobId);
             if(waylineJobDTO.isEmpty()) {
                 return ResponseResult.error("任务不存在");
@@ -91,13 +94,7 @@
     @ApiOperation("取消航线任务")
     @DeleteMapping("/jobs")
     public ResponseResult publishCancelJob(@RequestParam(name = "job_id") Set<String> jobIds){
-        try{
-            waylineJobService.cancelFlightTask(jobIds);
-        }
-        catch (Exception e){
-            return ResponseResult.error(e.getMessage());
-        }
-        return ResponseResult.success();
+        return waylineJobService.cancelFlightTask(jobIds);
     }
 
     /**

--
Gitblit v1.9.3