From cbf5045d84088891ef0696b189e1f8af6a653bad Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 13 Nov 2023 10:09:32 +0800
Subject: [PATCH] 图斑距离计算，定时任务添加逻辑
---
src/main/java/com/dji/sample/wayline/controller/WaylineJobController.java | 42 ++++++++++++++++++++++++++++--------------
1 files changed, 28 insertions(+), 14 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 1da52e6..0a416e0 100644
--- a/src/main/java/com/dji/sample/wayline/controller/WaylineJobController.java
+++ b/src/main/java/com/dji/sample/wayline/controller/WaylineJobController.java
@@ -6,9 +6,7 @@
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.model.param.*;
import com.dji.sample.wayline.service.IWaylineJobService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -16,6 +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;
@@ -34,6 +33,7 @@
/**
* 创建航路任务。
+ *
* @param request
* @param param
* @param workspaceId
@@ -44,7 +44,7 @@
@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);
+ CustomClaim customClaim = (CustomClaim) request.getAttribute(TOKEN_CLAIM);
customClaim.setWorkspaceId(workspaceId);
return waylineJobService.publishFlightTask(param, customClaim);
@@ -53,6 +53,7 @@
/**
* 创建航路任务(重复定时和连续执行)
+ *
* @param request
* @param param
* @param workspaceId
@@ -62,8 +63,8 @@
@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);
+ @PathVariable(name = "workspace_id") String workspaceId) throws SQLException {
+ CustomClaim customClaim = (CustomClaim) request.getAttribute(TOKEN_CLAIM);
customClaim.setWorkspaceId(workspaceId);
return waylineJobService.publishFlightTaskCondition(param, customClaim);
@@ -71,6 +72,7 @@
/**
* 分页查询
+ *
* @param page
* @param pageSize
* @param workspaceId
@@ -80,28 +82,28 @@
@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, WaylineJobQueryParam waylineJobQueryParam){
- PaginationData<WaylineJobDTO> data = waylineJobService.getJobsByWorkspaceId(workspaceId, page, pageSize,waylineJobQueryParam);
+ @PathVariable(name = "workspace_id") String workspaceId, WaylineJobQueryParam waylineJobQueryParam) {
+ PaginationData<WaylineJobDTO> data = waylineJobService.getJobsByWorkspaceId(workspaceId, page, pageSize, waylineJobQueryParam);
return ResponseResult.success(data);
}
/**
* 查询最新的记录
+ *
* @return
*/
@GetMapping("/{workspace_id}/latestJob")
- public ResponseResult<WaylineJobEntity> getLatestJobs(@PathVariable(name = "workspace_id") String workspaceId,WaylineJobQueryParam waylineJobQueryParam){
+ public ResponseResult<WaylineJobEntity> getLatestJobs(@PathVariable(name = "workspace_id") String workspaceId, WaylineJobQueryParam waylineJobQueryParam) {
- WaylineJobEntity waylineJobEntity = waylineJobService.getLatestJob(workspaceId,waylineJobQueryParam);
+ WaylineJobEntity waylineJobEntity = waylineJobService.getLatestJob(workspaceId, waylineJobQueryParam);
return ResponseResult.success(waylineJobEntity);
}
-
-
/**
* 发送命令取消作业。
+ *
* @param jobIds
* @param workspaceId
* @return
@@ -110,13 +112,14 @@
@DeleteMapping("/{workspace_id}/jobs")
@SysLogAnnotation(operModul = "计划库", operType = "删除", operDesc = "发送命令取消作业")
public ResponseResult publishCancelJob(@RequestParam(name = "job_id") Set<String> jobIds,
- @PathVariable(name = "workspace_id") String workspaceId) throws SQLException {
+ @PathVariable(name = "workspace_id") String workspaceId) throws SQLException {
waylineJobService.cancelFlightTask(workspaceId, jobIds);
return ResponseResult.success();
}
/**
* 将此作业的媒体文件设置为立即上传。
+ *
* @param workspaceId
* @param jobId
* @return
@@ -124,7 +127,7 @@
@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) {
+ @PathVariable(name = "job_id") String jobId) {
waylineJobService.uploadMediaHighestPriority(workspaceId, jobId);
return ResponseResult.success();
}
@@ -137,4 +140,15 @@
waylineJobService.updateJobStatus(workspaceId, jobId, param);
return ResponseResult.success();
}
+
+ /**
+ * 根据区域飞行
+ *
+ * @return
+ */
+ @PostMapping("/{sn}/jobs/flyByArea")
+ @SysLogAnnotation(operModul = "根据区域飞行", operType = "根据区域飞行", operDesc = "根据区域飞行")
+ public ResponseResult flyByArea(@PathVariable(name = "sn") String sn, @RequestBody FlyAreaParam flyAreaParam) {
+ return waylineJobService.flyByArea(sn,flyAreaParam );
+ }
}
--
Gitblit v1.9.3