From d76f8e3b59969d4bf0f1bf4c92730719bd5389d3 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Fri, 28 Nov 2025 16:54:55 +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, 15 insertions(+), 0 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 108f49e..4eb6b38 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
@@ -13,6 +13,7 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.sql.SQLException;
+import java.util.Optional;
import java.util.Set;
/**
@@ -41,6 +42,20 @@
return waylineJobService.publishFlightTask(param, loginUser);
}
+ @ApiOperation("获取航线任务")
+ @PostMapping("/flight-id")
+ public ResponseResult<WaylineJobDTO> getJob(@RequestParam(name = "job_id") String jobId) {
+ try {
+ Optional<WaylineJobDTO> waylineJobDTO = waylineJobService.getJobByJobId(jobId);
+ if(waylineJobDTO.isEmpty()) {
+ return ResponseResult.error("任务不存在");
+ }
+ return ResponseResult.success(waylineJobDTO.get());
+ } catch (Exception e) {
+ return ResponseResult.error(e.getMessage());
+ }
+ }
+
/**
* Paginate through all jobs.
* @param page
--
Gitblit v1.9.3