From 35c8aca3b8107ee2a4fbb5790ce1eeb70f4bb461 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Fri, 22 Mar 2024 18:15:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/wayline/service/IWaylineJobService.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 4be44be..30062bc 100644
--- a/src/main/java/com/dji/sample/wayline/service/IWaylineJobService.java
+++ b/src/main/java/com/dji/sample/wayline/service/IWaylineJobService.java
@@ -9,6 +9,7 @@
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.apache.ibatis.annotations.Param;
import org.springframework.messaging.MessageHeaders;
import java.sql.SQLException;
@@ -128,6 +129,16 @@
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.
* @param receiver
* @param headers
@@ -164,11 +175,11 @@
*/
WaylineJobEntity getLatestJob(String workspaceId, WaylineJobQueryParam waylineJobQueryParam);
- WaylineJobCountDTO patrolStatistics(String workspaceId,String queryTime);
+ WaylineJobCountDTO patrolStatistics(String workspaceId,String queryTime,String deviceSn);
void updateJobCollect(WaylineJobEntity waylineJob);
- ResponseResult flyByArea(String sn, FlyAreaParam flyAreaParam);
+ ResponseResult flyByArea(String sn, FlyAreaParam flyAreaParam,String deviceSn) throws Exception;
/**
* 判断是否有下一次任务
--
Gitblit v1.9.3