From f61c1902e30b0ab54e833960df7d2d79c8b62120 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 12 Oct 2023 17:11:05 +0800
Subject: [PATCH] 执行时间
---
src/main/java/com/dji/sample/wayline/controller/WaylineJobController.java | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 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 e22de66..29277d0 100644
--- a/src/main/java/com/dji/sample/wayline/controller/WaylineJobController.java
+++ b/src/main/java/com/dji/sample/wayline/controller/WaylineJobController.java
@@ -5,6 +5,8 @@
import com.dji.sample.common.model.ResponseResult;
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.*;
@@ -12,7 +14,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
import java.sql.SQLException;
-import java.util.List;
+import java.util.Set;
import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM;
@@ -29,7 +31,7 @@
private IWaylineJobService waylineJobService;
/**
- * Create a wayline task for the Dock.
+ * 创建航路任务。
* @param request
* @param param
* @param workspaceId
@@ -46,7 +48,7 @@
}
/**
- * Paginate through all jobs in this workspace.
+ * 分页查询
* @param page
* @param pageSize
* @param workspaceId
@@ -54,23 +56,44 @@
*/
@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
* @throws SQLException
*/
@DeleteMapping("/{workspace_id}/jobs")
- public ResponseResult publishCancelJob(@RequestParam(name = "job_id") List<String> jobIds,
+ public ResponseResult publishCancelJob(@RequestParam(name = "job_id") Set<String> jobIds,
@PathVariable(name = "workspace_id") String workspaceId) throws SQLException {
waylineJobService.cancelFlightTask(workspaceId, jobIds);
return ResponseResult.success();
}
+
+ /**
+ * 将此作业的媒体文件设置为立即上传。
+ * @param workspaceId
+ * @param jobId
+ * @return
+ */
+ @PostMapping("/{workspace_id}/jobs/{job_id}/media-highest")
+ public ResponseResult uploadMediaHighestPriority(@PathVariable(name = "workspace_id") String workspaceId,
+ @PathVariable(name = "job_id") String jobId) {
+ waylineJobService.uploadMediaHighestPriority(workspaceId, jobId);
+ return ResponseResult.success();
+ }
+
+ @PutMapping("/{workspace_id}/jobs/{job_id}")
+ public ResponseResult updateJobStatus(@PathVariable(name = "workspace_id") String workspaceId,
+ @PathVariable(name = "job_id") String jobId,
+ @Valid @RequestBody UpdateJobParam param) {
+ waylineJobService.updateJobStatus(workspaceId, jobId, param);
+ return ResponseResult.success();
+ }
}
--
Gitblit v1.9.3