From dd73bbc7132f7b126b8fc2faabf2827b49622d21 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 23 Oct 2023 09:28:40 +0800
Subject: [PATCH] 获取计划最近一条
---
src/main/java/com/dji/sample/wayline/controller/WaylineJobController.java | 80 ++++++++++++++++++++++++++++++++++++----
1 files changed, 72 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..1da52e6 100644
--- a/src/main/java/com/dji/sample/wayline/controller/WaylineJobController.java
+++ b/src/main/java/com/dji/sample/wayline/controller/WaylineJobController.java
@@ -3,8 +3,12 @@
import com.dji.sample.common.model.CustomClaim;
import com.dji.sample.common.model.PaginationData;
import com.dji.sample.common.model.ResponseResult;
+import com.dji.sample.log.aspect.SysLogAnnotation;
import com.dji.sample.wayline.model.dto.WaylineJobDTO;
+import com.dji.sample.wayline.model.entity.WaylineJobEntity;
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 +16,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 +33,7 @@
private IWaylineJobService waylineJobService;
/**
- * Create a wayline task for the Dock.
+ * 创建航路任务。
* @param request
* @param param
* @param workspaceId
@@ -37,6 +41,7 @@
* @throws SQLException
*/
@PostMapping("/{workspace_id}/flight-tasks")
+ @SysLogAnnotation(operModul = "计划库", operType = "新增", operDesc = "创建计划")
public ResponseResult createJob(HttpServletRequest request, @Valid @RequestBody CreateJobParam param,
@PathVariable(name = "workspace_id") String workspaceId) throws SQLException {
CustomClaim customClaim = (CustomClaim)request.getAttribute(TOKEN_CLAIM);
@@ -45,32 +50,91 @@
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")
+ @SysLogAnnotation(operModul = "计划库", operType = "新增", operDesc = "创建航路任务(重复定时和连续执行)")
+ 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
* @return
*/
@GetMapping("/{workspace_id}/jobs")
+ @SysLogAnnotation(operModul = "计划库", operType = "查询", operDesc = "分页查询")
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.
+ * 查询最新的记录
+ * @return
+ */
+ @GetMapping("/{workspace_id}/latestJob")
+ public ResponseResult<WaylineJobEntity> getLatestJobs(@PathVariable(name = "workspace_id") String workspaceId,WaylineJobQueryParam waylineJobQueryParam){
+
+ WaylineJobEntity waylineJobEntity = waylineJobService.getLatestJob(workspaceId,waylineJobQueryParam);
+
+ return ResponseResult.success(waylineJobEntity);
+ }
+
+
+
+
+ /**
+ * 发送命令取消作业。
* @param jobIds
* @param workspaceId
* @return
* @throws SQLException
*/
@DeleteMapping("/{workspace_id}/jobs")
- public ResponseResult publishCancelJob(@RequestParam(name = "job_id") List<String> jobIds,
+ @SysLogAnnotation(operModul = "计划库", operType = "删除", operDesc = "发送命令取消作业")
+ 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")
+ @SysLogAnnotation(operModul = "计划库", operType = "修改", operDesc = "将此作业的媒体文件设置为立即上传")
+ 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}")
+ @SysLogAnnotation(operModul = "计划库", operType = "修改", operDesc = "修改")
+ 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