From 55be62c63d9faedb48d47dd1c18cf1a74e3eea6c Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 15 Nov 2023 17:15:35 +0800
Subject: [PATCH] 图斑多点飞行，拍照
---
src/main/java/com/dji/sample/wayline/service/impl/WaylineJobServiceImpl.java | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 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..0d2d1a7 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);
@@ -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) {
--
Gitblit v1.9.3