From 2db1aa88e8ab53096a936163d686b90d8e056a99 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 21 Aug 2024 23:18:33 +0800
Subject: [PATCH] 国土对接返回信息加密

---
 src/main/java/com/dji/sample/wayline/service/IWaylineJobService.java |   25 +++++++++++++++++++++----
 1 files changed, 21 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 f99ab2c..e5e3d14 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;
@@ -41,7 +42,7 @@
      * @return
      */
     Optional<WaylineJobDTO> createWaylineJobByParent(String workspaceId, String parentId);
-
+    String getWaylineId(String jobId);
     /**
      * Issue wayline mission to the dock.
      * 向机场发出航线任务
@@ -111,6 +112,8 @@
      */
     Optional<WaylineJobDTO> getJobByJobId(String workspaceId, String jobId);
 
+    Optional<WaylineJobDTO> getJobByJobId(String workspaceId, String jobId,Boolean isBreakPoint);
+
     /**
      * Update job data.
      * @param dto
@@ -128,12 +131,24 @@
     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
      */
     void flightTaskResourceGet(CommonTopicReceiver receiver, MessageHeaders headers);
 
+    List<String> selectJobIdByName (String name);
     /**
      * Set the media files for this job to upload immediately.
      * @param workspaceId
@@ -148,13 +163,15 @@
      * @param param
      */
     void updateJobStatus(String workspaceId, String jobId, UpdateJobParam param);
-
+    List<String> getJobNamesByPartialName(String partialJobName);
     /**
      * Query the wayline execution status of the dock.
      * @param dockSn
      * @return
      */
     WaylineJobStatusEnum getWaylineState(String dockSn);
+    String getName(String jobId);
+    List<String> getJobIds(String jobNames);
 
     /**
      * 获取最新的航线任务
@@ -164,11 +181,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,String deviceSn);
+    ResponseResult flyByArea(String sn, FlyAreaParam flyAreaParam,String deviceSn) throws Exception;
 
     /**
      * 判断是否有下一次任务

--
Gitblit v1.9.3