From 42841034c3da8c5dc15bd3e9400b622675bcc2f4 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sat, 14 Oct 2023 17:35:25 +0800
Subject: [PATCH] 重复定时、连续执行任务新增接口
---
src/main/java/com/dji/sample/wayline/controller/WaylineJobController.java | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/dji/sample/wayline/controller/WaylineJobController.java b/src/main/java/com/dji/sample/wayline/controller/WaylineJobController.java
index 481b6a2..ef9ef82 100644
--- a/src/main/java/com/dji/sample/wayline/controller/WaylineJobController.java
+++ b/src/main/java/com/dji/sample/wayline/controller/WaylineJobController.java
@@ -6,6 +6,7 @@
import com.dji.sample.wayline.model.dto.WaylineJobDTO;
import com.dji.sample.wayline.model.param.CreateJobParam;
import com.dji.sample.wayline.model.param.UpdateJobParam;
+import com.dji.sample.wayline.model.param.WaylineJobQueryParam;
import com.dji.sample.wayline.service.IWaylineJobService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -30,7 +31,7 @@
private IWaylineJobService waylineJobService;
/**
- * Create a wayline task for the Dock.
+ * 创建航路任务。
* @param request
* @param param
* @param workspaceId
@@ -46,8 +47,26 @@
return waylineJobService.publishFlightTask(param, customClaim);
}
+
/**
- * Paginate through all jobs in this workspace.
+ * 创建航路任务(重复定时和连续执行)
+ * @param request
+ * @param param
+ * @param workspaceId
+ * @return
+ * @throws SQLException
+ */
+ @PostMapping("/{workspace_id}/flight-tasks-condition")
+ public ResponseResult createJobCondition(HttpServletRequest request, @Valid @RequestBody CreateJobParam param,
+ @PathVariable(name = "workspace_id") String workspaceId) throws SQLException {
+ CustomClaim customClaim = (CustomClaim)request.getAttribute(TOKEN_CLAIM);
+ customClaim.setWorkspaceId(workspaceId);
+
+ return waylineJobService.publishFlightTaskCondition(param, customClaim);
+ }
+
+ /**
+ * 分页查询
* @param page
* @param pageSize
* @param workspaceId
@@ -55,14 +74,14 @@
*/
@GetMapping("/{workspace_id}/jobs")
public ResponseResult<PaginationData<WaylineJobDTO>> getJobs(@RequestParam(defaultValue = "1") Long page,
- @RequestParam(name = "page_size", defaultValue = "10") Long pageSize,
- @PathVariable(name = "workspace_id") String workspaceId) {
- PaginationData<WaylineJobDTO> data = waylineJobService.getJobsByWorkspaceId(workspaceId, page, pageSize);
+ @RequestParam(name = "page_size", defaultValue = "10") Long pageSize,
+ @PathVariable(name = "workspace_id") String workspaceId, WaylineJobQueryParam waylineJobQueryParam){
+ PaginationData<WaylineJobDTO> data = waylineJobService.getJobsByWorkspaceId(workspaceId, page, pageSize,waylineJobQueryParam);
return ResponseResult.success(data);
}
/**
- * Send the command to cancel the jobs.
+ * 发送命令取消作业。
* @param jobIds
* @param workspaceId
* @return
@@ -76,7 +95,7 @@
}
/**
- * Set the media files for this job to upload immediately.
+ * 将此作业的媒体文件设置为立即上传。
* @param workspaceId
* @param jobId
* @return
--
Gitblit v1.9.3