From 8d9a2d656e4ae007590c622e5f7c228adacdca49 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Fri, 14 Jun 2024 10:11:36 +0800
Subject: [PATCH] 统一风格
---
src/main/java/com/dji/sample/wayline/service/IWaylineJobService.java | 62 +++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 4 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 ec04134..29fc99b 100644
--- a/src/main/java/com/dji/sample/wayline/service/IWaylineJobService.java
+++ b/src/main/java/com/dji/sample/wayline/service/IWaylineJobService.java
@@ -4,11 +4,12 @@
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.entity.WaylineJobEntity;
import com.dji.sample.wayline.model.enums.WaylineJobStatusEnum;
-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 org.apache.ibatis.annotations.Param;
import org.springframework.messaging.MessageHeaders;
import java.sql.SQLException;
@@ -44,6 +45,7 @@
/**
* Issue wayline mission to the dock.
+ * 向机场发出航线任务
* @param param
* @param customClaim user info
* @return
@@ -52,6 +54,16 @@
/**
* 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
@@ -60,6 +72,7 @@
/**
* Execute the task immediately.
+ * 执行立即任务
* @param jobId
* @throws SQLException
* @return
@@ -99,12 +112,14 @@
*/
Optional<WaylineJobDTO> getJobByJobId(String workspaceId, String jobId);
+ Optional<WaylineJobDTO> getJobByJobId(String workspaceId, String jobId,Boolean isBreakPoint);
+
/**
* Update job data.
* @param dto
* @return
*/
- Boolean updateJob(WaylineJobDTO dto);
+ Boolean updateJob(WaylineJobDTO dto) ;
/**
* Paginate through all jobs in this workspace.
@@ -114,6 +129,17 @@
* @return
*/
PaginationData<WaylineJobDTO> getJobsByWorkspaceId(String workspaceId, long page, long pageSize, WaylineJobQueryParam waylineJobQueryParam);
+
+ /**
+ * 不分子任务列表
+ *
+ * @param workspaceId
+ * @param page
+ * @param pageSize
+ * @param waylineJobQueryParam
+ * @return
+ */
+ PaginationData<WaylineJobDTO> getJobsByWorkspaceIdNew(String workspaceId, long page, long pageSize, WaylineJobQueryParam waylineJobQueryParam, String order);
/**
* Process to get interface data of flight mission resources.
@@ -143,4 +169,32 @@
* @return
*/
WaylineJobStatusEnum getWaylineState(String dockSn);
+
+ /**
+ * 获取最新的航线任务
+ * @param workspaceId
+ * @param waylineJobQueryParam
+ * @return
+ */
+ WaylineJobEntity getLatestJob(String workspaceId, WaylineJobQueryParam waylineJobQueryParam);
+
+ WaylineJobCountDTO patrolStatistics(String workspaceId,String queryTime,String deviceSn);
+
+ 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