From ffe731d748e54363c715048a03857788ee62ba21 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Fri, 06 Feb 2026 17:14:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-admin/src/main/java/com/ard/web/controller/sample/wayline/WaylineJobController.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 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..56a500a 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
@@ -43,12 +43,15 @@
}
@ApiOperation("获取航线任务")
- @PostMapping("/flight-id")
+ @GetMapping("/flight-id")
public ResponseResult<WaylineJobDTO> getJob(@RequestParam(name = "job_id") String jobId) {
try {
+ if(jobId == null){
+ return ResponseResult.error(98,"任务ID不能为空");
+ }
Optional<WaylineJobDTO> waylineJobDTO = waylineJobService.getJobByJobId(jobId);
if(waylineJobDTO.isEmpty()) {
- return ResponseResult.error("任务不存在");
+ return ResponseResult.error(99,"任务不存在");
}
return ResponseResult.success(waylineJobDTO.get());
} catch (Exception e) {
@@ -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