From c115e881f015101269bd4010175ddf448a248731 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Thu, 27 Nov 2025 17:04:17 +0800
Subject: [PATCH] 2025-11-27 zwy Hms接口完成
---
ard-admin/src/main/java/com/ard/web/controller/sample/wayline/WaylineJobController.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 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..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
@@ -57,9 +72,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 +91,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