From ae0db4ad3e552385ae8d3629dd9c594d9e3c7309 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Thu, 16 Nov 2023 18:20:02 +0800
Subject: [PATCH] 无人机 -查询任务媒体库优化

---
 src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 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 0d2d1a7..b0129cf 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
@@ -729,7 +729,7 @@
                 List<PointDTO> pointDTOS = new ArrayList<>();
 
                 PointDTO pointDTO = new PointDTO();
-                pointDTO.setHeight(150.0);
+                pointDTO.setHeight(120.0);
                 pointDTO.setLongitude(targetList.get(0).getLon());
                 pointDTO.setLatitude(targetList.get(0).getLat());
                 pointDTOS.add(pointDTO);
@@ -899,7 +899,7 @@
         List<WaylineJobEntity> list = mapper.patrolStatistics(workspaceId, queryTime);
         if (!CollectionUtils.isEmpty(list)) {
             waylineJobCountDTO.setTotalNumber(list.size());
-            long totalTime = list.stream().mapToLong(s -> s.getEndTime() - s.getBeginTime()).sum() / 1000;
+            long totalTime = list.stream().filter(task -> task.getCompletedTime()!= null && task.getExecuteTime()!= null).mapToLong(s -> s.getCompletedTime() - s.getExecuteTime()).sum() / 1000;
             StringBuffer buffer = new StringBuffer();
             long h = totalTime / 3600;
             long m = (totalTime % 3600) / 60;

--
Gitblit v1.9.3