From d175a7fe7d6e96c0e6abfe3954eefed539bb6e3c Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 18 Sep 2023 19:23:41 +0800
Subject: [PATCH] 初始提交
---
src/main/java/com/dji/sample/wayline/controller/WaylineJobController.java | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 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 f066f54..481b6a2 100644
--- a/src/main/java/com/dji/sample/wayline/controller/WaylineJobController.java
+++ b/src/main/java/com/dji/sample/wayline/controller/WaylineJobController.java
@@ -5,12 +5,15 @@
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.service.IWaylineJobService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
import java.sql.SQLException;
+import java.util.Set;
import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM;
@@ -35,12 +38,12 @@
* @throws SQLException
*/
@PostMapping("/{workspace_id}/flight-tasks")
- public ResponseResult createJob(HttpServletRequest request, @RequestBody CreateJobParam param,
+ public ResponseResult createJob(HttpServletRequest request, @Valid @RequestBody CreateJobParam param,
@PathVariable(name = "workspace_id") String workspaceId) throws SQLException {
CustomClaim customClaim = (CustomClaim)request.getAttribute(TOKEN_CLAIM);
customClaim.setWorkspaceId(workspaceId);
- boolean isCreate = waylineJobService.createJob(param, customClaim);
- return isCreate ? ResponseResult.success() : ResponseResult.error();
+
+ return waylineJobService.publishFlightTask(param, customClaim);
}
/**
@@ -59,16 +62,37 @@
}
/**
- * Issue wayline mission to the dock for execution.
- * @param jobId
+ * Send the command to cancel the jobs.
+ * @param jobIds
* @param workspaceId
* @return
* @throws SQLException
*/
- @PostMapping("/{workspace_id}/jobs/{job_id}")
- public ResponseResult publishJob(@PathVariable(name = "job_id") String jobId,
+ @DeleteMapping("/{workspace_id}/jobs")
+ public ResponseResult publishCancelJob(@RequestParam(name = "job_id") Set<String> jobIds,
@PathVariable(name = "workspace_id") String workspaceId) throws SQLException {
- waylineJobService.publishFlightTask(workspaceId, jobId);
+ waylineJobService.cancelFlightTask(workspaceId, jobIds);
+ return ResponseResult.success();
+ }
+
+ /**
+ * Set the media files for this job to upload immediately.
+ * @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