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 | 26 ++++++++++----------------
1 files changed, 10 insertions(+), 16 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 a009206..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
@@ -12,14 +12,16 @@
import com.dji.sample.common.model.Pagination;
import com.dji.sample.common.model.PaginationData;
import com.dji.sample.common.model.ResponseResult;
+import com.dji.sample.common.util.SpringBeanUtils;
import com.dji.sample.component.mqtt.model.*;
import com.dji.sample.component.mqtt.service.IMessageSenderService;
import com.dji.sample.component.redis.RedisConst;
import com.dji.sample.component.redis.RedisOpsUtils;
import com.dji.sample.control.model.dto.PointDTO;
-import com.dji.sample.control.model.param.DrcModeParam;
-import com.dji.sample.control.model.param.FlyToPointParam;
-import com.dji.sample.control.model.param.TakeoffToPointParam;
+import com.dji.sample.control.model.enums.CameraModeEnum;
+import com.dji.sample.control.model.enums.DroneAuthorityEnum;
+import com.dji.sample.control.model.enums.PayloadCommandsEnum;
+import com.dji.sample.control.model.param.*;
import com.dji.sample.control.service.IControlService;
import com.dji.sample.control.service.IDrcService;
import com.dji.sample.geo.entity.GeoJson;
@@ -701,7 +703,7 @@
}
@Override
- public ResponseResult flyByArea(String sn, FlyAreaParam flyAreaParam, String deviceSn) {
+ public ResponseResult flyByArea(String sn, FlyAreaParam flyAreaParam, String deviceSn) throws Exception {
//获取所有中心点
// List<PointPOJO> targetList = GeoUtils.caculatePointList(flyAreaParam);
@@ -727,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);
@@ -738,25 +740,17 @@
if (flyToRes.getCode() == ResponseResult.CODE_SUCCESS) {
//第一个点指令飞行成功后，把数组存到redis中
- /**
- * {
- * targetList:[],
- * curIndex:
- * }
- */
-
JSONObject jsonObject = new JSONObject();
jsonObject.put("targetList",targetList);
+ jsonObject.put("payloadIndex",flyAreaParam.getPayloadIndex());
jsonObject.put("curIndex",0);
-
-
RedisOpsUtils.set("tuban:"+sn,jsonObject);
}
break;
}
}
- return ResponseResult.success();
+ return ResponseResult.success(targetList);
}
public TakeoffToPointParam buildTakeoffToPointParam(PointPOJO dockPoint) {
@@ -905,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