From 3579c8e2bf38781e634c8ba4a6347b009002d9ba Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Tue, 03 Mar 2026 10:03:06 +0800
Subject: [PATCH] 1. 修改创建航线报错问题。
---
ard-route/src/main/java/com/ard/route/util/RouteFileUtils.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/ard-route/src/main/java/com/ard/route/util/RouteFileUtils.java b/ard-route/src/main/java/com/ard/route/util/RouteFileUtils.java
index da95d7b..ceeb180 100644
--- a/ard-route/src/main/java/com/ard/route/util/RouteFileUtils.java
+++ b/ard-route/src/main/java/com/ard/route/util/RouteFileUtils.java
@@ -155,7 +155,8 @@
kmlDroneInfo.setDroneEnumValue(String.valueOf(droneType));
if (Objects.equals(droneType, DroneEnumValueEnums.M30_M30T.getValue()) ||
Objects.equals(droneType, DroneEnumValueEnums.M3D_M3TD.getValue()) ||
- Objects.equals(droneType, DroneEnumValueEnums.M3E_M3T_M3M.getValue())) {
+ Objects.equals(droneType, DroneEnumValueEnums.M3E_M3T_M3M.getValue())||
+ Objects.equals(droneType, DroneEnumValueEnums.MATRICE_4D.getValue())) {
kmlDroneInfo.setDroneSubEnumValue(String.valueOf(subDroneType));
}
return kmlDroneInfo;
@@ -337,7 +338,9 @@
if (CollectionUtil.isNotEmpty(routePointInfo.getActionGroupList())) {
List<KmlActionGroup> kmlActionGroupList = new ArrayList<>();
for (ActionGroupReq actionGroupReq : routePointInfo.getActionGroupList()) {
- kmlActionGroupList.add(buildKmlActionGroup(actionGroupReq, kmlParams));
+ if (ObjectUtil.isNotEmpty(actionGroupReq.getActions())){
+ kmlActionGroupList.add(buildKmlActionGroup(actionGroupReq, kmlParams));
+ }
}
kmlPlacemark.setActionGroup(kmlActionGroupList);
}
@@ -500,13 +503,13 @@
public static KmlActionGroup buildKmlActionGroup(ActionGroupReq actionGroupReq, KmlParams kmlParams) {
KmlActionGroup kmlActionGroup = new KmlActionGroup();
- kmlActionGroup.setActionGroupId(String.valueOf(actionGroupReq.getActionGroupId()));
- kmlActionGroup.setActionGroupStartIndex(String.valueOf(actionGroupReq.getActionGroupStartIndex()));
- kmlActionGroup.setActionGroupEndIndex(String.valueOf(actionGroupReq.getActionGroupEndIndex()));
- kmlActionGroup.setActionGroupMode(ActionGroupModeEnums.SEQUENCE.getValue());
+ kmlActionGroup.setActionGroupId(String.valueOf(actionGroupReq.getActionGroupId()));
+ kmlActionGroup.setActionGroupStartIndex(String.valueOf(actionGroupReq.getActionGroupStartIndex()));
+ kmlActionGroup.setActionGroupEndIndex(String.valueOf(actionGroupReq.getActionGroupEndIndex()));
+ kmlActionGroup.setActionGroupMode(ActionGroupModeEnums.SEQUENCE.getValue());
- kmlActionGroup.setActionTrigger(buildKmlActionTrigger(actionGroupReq.getActionTriggerType(), actionGroupReq.getActionTriggerParam()));
- kmlActionGroup.setAction(getKmlActionList(actionGroupReq.getActions(), kmlParams));
+ kmlActionGroup.setActionTrigger(buildKmlActionTrigger(actionGroupReq.getActionTriggerType(), actionGroupReq.getActionTriggerParam()));
+ kmlActionGroup.setAction(getKmlActionList(actionGroupReq.getActions(), kmlParams));
return kmlActionGroup;
}
@@ -538,7 +541,11 @@
}else {
kmlActionActuatorFuncParam.setFileSuffix("panoramicPhoto_360");
}
- kmlActionActuatorFuncParam.setUseGlobalPayloadLensIndex(String.valueOf(pointActionReq.getUseGlobalImageFormat()));
+ if (pointActionReq.getUseGlobalImageFormat() != null) {
+ kmlActionActuatorFuncParam.setUseGlobalPayloadLensIndex(String.valueOf(pointActionReq.getUseGlobalImageFormat()));
+ }else {
+ kmlActionActuatorFuncParam.setUseGlobalPayloadLensIndex("0");
+ }
if (ObjectUtil.equals(pointActionReq.getUseGlobalImageFormat(), 0)) {
kmlActionActuatorFuncParam.setPayloadLensIndex(pointActionReq.getImageFormat());
} else {
--
Gitblit v1.9.3