From 68f80a7451a126335153ec00bb6cb520a5ae1f8d Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 13 Nov 2023 17:02:45 +0800
Subject: [PATCH] 定时任务逻辑修改
---
src/main/java/com/dji/sample/wayline/service/IWaylineJobService.java | 50 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 40 insertions(+), 10 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 7083323..4be44be 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,11 @@
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.springframework.messaging.MessageHeaders;
import java.sql.SQLException;
@@ -54,18 +53,21 @@
/**
* 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;
-
- /**
- * 发布飞行任务
- * @return
- */
- Boolean publishFlightTask(WaylineJobEntity waylineJobEntity);
/**
* Execute the task immediately.
@@ -114,7 +116,7 @@
* @param dto
* @return
*/
- Boolean updateJob(WaylineJobDTO dto);
+ Boolean updateJob(WaylineJobDTO dto) ;
/**
* Paginate through all jobs in this workspace.
@@ -153,4 +155,32 @@
* @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);
+
+ /**
+ * 判断是否有下一次任务
+ * @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