From 3ba2ea4de914835bc316826f2c7f93a648760e9c Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 26 Sep 2023 16:24:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'

---
 src/main/java/com/dji/sample/wayline/controller/WaylineJobController.java |   51 ++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 38 insertions(+), 13 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..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,12 +5,16 @@
 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.*;
 
 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;
 
@@ -27,7 +31,7 @@
     private IWaylineJobService waylineJobService;
 
     /**
-     * Create a wayline task for the Dock.
+     * 创建航路任务。
      * @param request
      * @param param
      * @param workspaceId
@@ -35,16 +39,16 @@
      * @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);
     }
 
     /**
-     * Paginate through all jobs in this workspace.
+     * 分页查询
      * @param page
      * @param pageSize
      * @param workspaceId
@@ -52,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);
     }
 
     /**
-     * Issue wayline mission to the dock for execution.
-     * @param jobId
+     * 发送命令取消作业。
+     * @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();
+    }
+
+    /**
+     * 将此作业的媒体文件设置为立即上传。
+     * @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