From 35f286bc5109a7ea8bb3a27ff918451f173bf87d Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 21 Mar 2024 14:54:43 +0800
Subject: [PATCH] 自定义排序修改
---
src/main/java/com/dji/sample/wayline/service/IWaylineJobService.java | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 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 3dd5d63..30062bc 100644
--- a/src/main/java/com/dji/sample/wayline/service/IWaylineJobService.java
+++ b/src/main/java/com/dji/sample/wayline/service/IWaylineJobService.java
@@ -8,9 +8,8 @@
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;
@@ -118,7 +117,7 @@
* @param dto
* @return
*/
- Boolean updateJob(WaylineJobDTO dto);
+ Boolean updateJob(WaylineJobDTO dto) ;
/**
* Paginate through all jobs in this workspace.
@@ -128,6 +127,16 @@
* @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.
@@ -166,7 +175,23 @@
*/
WaylineJobEntity getLatestJob(String workspaceId, WaylineJobQueryParam waylineJobQueryParam);
- WaylineJobCountDTO patrolStatistics(String workspaceId);
+ 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