From f98b25a34d04c2acb9bf93e6cbd4e72fa2d81ba0 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Sat, 13 Apr 2024 11:40:29 +0800
Subject: [PATCH] 航线规划修改

---
 src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java b/src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java
index b138833..b40ba98 100644
--- a/src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java
+++ b/src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java
@@ -531,6 +531,18 @@
     }
 
     @Override
+    public PaginationData<WaylineJobDTO> getJobsByWorkspaceIdNew(String workspaceId, long page, long pageSize, WaylineJobQueryParam waylineJobQueryParam, String order) {
+        Page<WaylineJobEntity> pageData = mapper.getPageNew(new Page<WaylineJobEntity>(page, pageSize), waylineJobQueryParam, workspaceId,order);
+
+        List<WaylineJobDTO> records = pageData.getRecords()
+                .stream()
+                .map(this::entity2Dto)
+                .collect(Collectors.toList());
+
+        return new PaginationData<WaylineJobDTO>(records, new Pagination(pageData));
+    }
+
+    @Override
     public List<WaylineJobDTO> getChildrenJobs(String workspaceId, WaylineJobQueryParam waylineJobQueryParam) {
 
         List<WaylineJobEntity> list = mapper.getJobs(workspaceId, waylineJobQueryParam);

--
Gitblit v1.9.3