From 04c90bec00f91e8c403d7acaa338f69e5029617a Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 02 Dec 2025 10:41:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-route/src/main/java/com/ard/route/util/UavRouteReqUtils.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/ard-route/src/main/java/com/ard/route/util/UavRouteReqUtils.java b/ard-route/src/main/java/com/ard/route/util/UavRouteReqUtils.java
index 8e90bb6..3a13661 100644
--- a/ard-route/src/main/java/com/ard/route/util/UavRouteReqUtils.java
+++ b/ard-route/src/main/java/com/ard/route/util/UavRouteReqUtils.java
@@ -22,11 +22,8 @@
public class UavRouteReqUtils {
- @Resource
- private OssServiceContext ossService;
-
// 将文件转换成 UavRouteReq 实体
- public static KmzInfoVo fileConversionEntity(MultipartFile file){
+ public static UavRouteReq fileConversionEntity(MultipartFile file){
KmzInfoVo kmzInfoVO = new KmzInfoVo();
try (InputStream inputStream = file.getInputStream();
ArchiveInputStream archiveInputStream = new ZipArchiveInputStream(inputStream)){
@@ -39,14 +36,14 @@
kmzInfoVO.setWpmlInfo(RouteFileUtils.parseKml(archiveInputStream));
}
}
- return kmzInfoVO;
+ return kmzInfoVoToUavRouteReq(kmzInfoVO);
}catch (Exception e) {
e.printStackTrace();
}
return null;
}
- public static UavRouteReq kmzInfoVOToUavRouteReq(KmzInfoVo vo) {
+ public static UavRouteReq kmzInfoVoToUavRouteReq(KmzInfoVo vo) {
UavRouteReq uavRouteReq = new UavRouteReq();
if (vo.getKmlInfo().getDocument().getFolder().getTemplateType() != null){
uavRouteReq.setTemplateType(vo.getKmlInfo().getDocument().getFolder().getTemplateType());
@@ -119,13 +116,13 @@
pointActionReq.setGimbalYawRotateAngle(Double.valueOf(kmlAction.getActionActuatorFuncParam().getGimbalYawRotateAngle()));
}
}
- if ("zoom".equals(kmlAction.getActionActuatorFunc())) {
+ if ("zoom".equals(kmlAction.getActionActuatorFunc())) { // 变焦
pointActionReq.setZoom(Double.valueOf(kmlAction.getActionActuatorFuncParam().getFocalLength()));
}
- if ("hover".equals(kmlAction.getActionActuatorFunc())) {
+ if ("hover".equals(kmlAction.getActionActuatorFunc())) { // 悬停
pointActionReq.setHoverTime(Integer.valueOf(kmlAction.getActionActuatorFuncParam().getHoverTime()));
}
- if ("rotateYaw".equals(kmlAction.getActionActuatorFunc())) {
+ if ("rotateYaw".equals(kmlAction.getActionActuatorFunc())) { // 飞行器偏航
pointActionReq.setAircraftHeading(Double.valueOf(kmlAction.getActionActuatorFuncParam().getAircraftHeading()));
}
return pointActionReq;
--
Gitblit v1.9.3