From 97082b60eb2fbccb66f7f0beefb5cb591448ec10 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 01 Apr 2024 15:55:32 +0800
Subject: [PATCH] 升级版本1.9.0

---
 src/main/java/com/dji/sample/wayline/service/IWaylineJobService.java |   39 +++++++++++++++++++++++++++++++++++----
 1 files changed, 35 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 e41b145..ba4833b 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,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;
@@ -117,7 +117,7 @@
      * @param dto
      * @return
      */
-    Boolean updateJob(WaylineJobDTO dto);
+    Boolean updateJob(WaylineJobDTO dto) ;
 
     /**
      * Paginate through all jobs in this workspace.
@@ -127,6 +127,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.
@@ -164,4 +175,24 @@
      * @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