From 35c8a9c2babfd373313892af16a031d4c1c21689 Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Tue, 10 Feb 2026 13:44:30 +0800
Subject: [PATCH] 1. 修改校验航线任务是否可以创建航线接口。 2. 增加返回实体类。
---
ard-admin/src/main/java/com/ard/web/controller/sample/wayline/WaylineJobController.java | 26 +++++++++++++++++++-------
1 files changed, 19 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 108f49e..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
@@ -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;
/**
@@ -39,6 +40,23 @@
public ResponseResult createJob(@Valid @RequestBody CreateJobParam param) throws SQLException {
LoginUser loginUser = SecurityUtils.getLoginUser();
return waylineJobService.publishFlightTask(param, loginUser);
+ }
+
+ @ApiOperation("获取航线任务")
+ @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(99,"任务不存在");
+ }
+ return ResponseResult.success(waylineJobDTO.get());
+ } catch (Exception e) {
+ return ResponseResult.error(e.getMessage());
+ }
}
/**
@@ -76,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