From bf4990ffb53e2a0e7b2ec0c7a8a054bdf8a57db5 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Thu, 16 Nov 2023 10:02:13 +0800
Subject: [PATCH] 无人机 -设备分页新增保护区ID查询条件
---
src/main/java/com/dji/sample/wayline/service/IWaylineJobService.java | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 110 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/dji/sample/wayline/service/IWaylineJobService.java b/src/main/java/com/dji/sample/wayline/service/IWaylineJobService.java
index d20c53d..66093fe 100644
--- a/src/main/java/com/dji/sample/wayline/service/IWaylineJobService.java
+++ b/src/main/java/com/dji/sample/wayline/service/IWaylineJobService.java
@@ -4,12 +4,16 @@
import com.dji.sample.common.model.PaginationData;
import com.dji.sample.common.model.ResponseResult;
import com.dji.sample.component.mqtt.model.CommonTopicReceiver;
+import com.dji.sample.wayline.model.dto.WaylineJobCountDTO;
import com.dji.sample.wayline.model.dto.WaylineJobDTO;
-import com.dji.sample.wayline.model.param.CreateJobParam;
+import com.dji.sample.wayline.model.entity.WaylineJobEntity;
+import com.dji.sample.wayline.model.enums.WaylineJobStatusEnum;
+import com.dji.sample.wayline.model.param.*;
import org.springframework.messaging.MessageHeaders;
import java.sql.SQLException;
import java.util.Collection;
+import java.util.List;
import java.util.Optional;
/**
@@ -22,13 +26,25 @@
/**
* Create wayline job in the database.
* @param param
- * @param customClaim user info
+ * @param workspaceId user info
+ * @param username user info
+ * @param beginTime The time the job started.
+ * @param endTime The time the job ended.
* @return
*/
- Optional<WaylineJobDTO> createWaylineJob(CreateJobParam param, CustomClaim customClaim);
+ Optional<WaylineJobDTO> createWaylineJob(CreateJobParam param, String workspaceId, String username, Long beginTime, Long endTime);
+
+ /**
+ * Create a sub-task based on the information of the parent task.
+ * @param workspaceId
+ * @param parentId
+ * @return
+ */
+ Optional<WaylineJobDTO> createWaylineJobByParent(String workspaceId, String parentId);
/**
* Issue wayline mission to the dock.
+ * 向机场发出航线任务
* @param param
* @param customClaim user info
* @return
@@ -36,12 +52,31 @@
ResponseResult publishFlightTask(CreateJobParam param, CustomClaim customClaim) throws SQLException;
/**
+ * Issue wayline mission to the dock.
+ * 向机场发出航线任务（重复任务和定时任务）
+ * @param param
+ * @param customClaim user info
+ * @return
+ */
+ ResponseResult publishFlightTaskCondition(CreateJobParam param, CustomClaim customClaim) throws SQLException;
+
+ /**
+ * Issue wayline mission to the dock.
+ * 向机场添加航线任务指令
+ * @param waylineJob
+ * @return
+ * @throws SQLException
+ */
+ ResponseResult publishOneFlightTask(WaylineJobDTO waylineJob) throws SQLException;
+
+ /**
* Execute the task immediately.
+ * 执行立即任务
* @param jobId
* @throws SQLException
* @return
*/
- Boolean executeFlightTask(String jobId);
+ Boolean executeFlightTask(String workspaceId, String jobId);
/**
* Cancel the task Base on job Ids.
@@ -52,18 +87,36 @@
void cancelFlightTask(String workspaceId, Collection<String> jobIds);
/**
+ * Cancel the dock tasks that have been issued but have not yet been executed.
+ * @param workspaceId
+ * @param dockSn
+ * @param jobIds
+ */
+ void publishCancelTask(String workspaceId, String dockSn, List<String> jobIds);
+
+ /**
+ * Query wayline jobs based on conditions.
+ * @param workspaceId
+ * @param jobIds
+ * @param status
+ * @return
+ */
+ List<WaylineJobDTO> getJobsByConditions(String workspaceId, Collection<String> jobIds, WaylineJobStatusEnum status);
+
+ /**
* Query job information based on job id.
+ * @param workspaceId
* @param jobId
* @return job information
*/
- Optional<WaylineJobDTO> getJobByJobId(String jobId);
+ Optional<WaylineJobDTO> getJobByJobId(String workspaceId, String jobId);
/**
* Update job data.
* @param dto
* @return
*/
- Boolean updateJob(WaylineJobDTO dto);
+ Boolean updateJob(WaylineJobDTO dto) ;
/**
* Paginate through all jobs in this workspace.
@@ -72,7 +125,7 @@
* @param pageSize
* @return
*/
- PaginationData<WaylineJobDTO> getJobsByWorkspaceId(String workspaceId, long page, long pageSize);
+ PaginationData<WaylineJobDTO> getJobsByWorkspaceId(String workspaceId, long page, long pageSize, WaylineJobQueryParam waylineJobQueryParam);
/**
* Process to get interface data of flight mission resources.
@@ -80,4 +133,54 @@
* @param headers
*/
void flightTaskResourceGet(CommonTopicReceiver receiver, MessageHeaders headers);
+
+ /**
+ * Set the media files for this job to upload immediately.
+ * @param workspaceId
+ * @param jobId
+ */
+ void uploadMediaHighestPriority(String workspaceId, String jobId);
+
+ /**
+ * Manually control the execution status of wayline job.
+ * @param workspaceId
+ * @param jobId
+ * @param param
+ */
+ void updateJobStatus(String workspaceId, String jobId, UpdateJobParam param);
+
+ /**
+ * Query the wayline execution status of the dock.
+ * @param dockSn
+ * @return
+ */
+ WaylineJobStatusEnum getWaylineState(String dockSn);
+
+ /**
+ * 获取最新的航线任务
+ * @param workspaceId
+ * @param waylineJobQueryParam
+ * @return
+ */
+ WaylineJobEntity getLatestJob(String workspaceId, WaylineJobQueryParam waylineJobQueryParam);
+
+ WaylineJobCountDTO patrolStatistics(String workspaceId,String queryTime);
+
+ void updateJobCollect(WaylineJobEntity waylineJob);
+
+ ResponseResult flyByArea(String sn, FlyAreaParam flyAreaParam,String deviceSn) throws Exception;
+
+ /**
+ * 判断是否有下一次任务
+ * @param job
+ */
+ ResponseResult checkNextJob(WaylineJobDTO job) throws SQLException ;
+
+ /**
+ * 根据父Id获取子项
+ * @param workspaceId
+ * @param waylineJobQueryParam
+ * @return
+ */
+ List<WaylineJobDTO> getChildrenJobs(String workspaceId, WaylineJobQueryParam waylineJobQueryParam);
}
--
Gitblit v1.9.3