From 70c59fee44a5a85fa140d65b02f640efa7f0eb72 Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Sat, 13 Dec 2025 16:33:27 +0800
Subject: [PATCH] 1. 修改无动作参数报错问题。
---
ard-route/src/main/java/com/ard/route/util/InitializationUtils.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/ard-route/src/main/java/com/ard/route/util/InitializationUtils.java b/ard-route/src/main/java/com/ard/route/util/InitializationUtils.java
index 747af86..c81d8a1 100644
--- a/ard-route/src/main/java/com/ard/route/util/InitializationUtils.java
+++ b/ard-route/src/main/java/com/ard/route/util/InitializationUtils.java
@@ -17,7 +17,7 @@
public class InitializationUtils {
// 禅思H20T 公倍数
- private static final Double CHANSI_H20 = 23.76237623;
+ private static final Double CHANSI_H20T = 23.76237623;
// 禅思H20T 焦距值
private static final Double CHANSI_H20_FOCUS = 6.83;
@@ -98,17 +98,35 @@
*/
private void buildZoom(UavRouteReq uavRouteReq){
for (RoutePointReq routePointReq : uavRouteReq.getRoutePointList()) {
- for (ActionGroupReq actionGroupReq : routePointReq.getActionGroupList()) {
- for (PointActionReq action : actionGroupReq.getActions()) {
- if (action.getZoom() != null){
- //action.setZoom(action.getZoom() * CHANSI_H20);
- action.setZoom(action.getZoom() * CHANSI_H20_FOCUS);
+ if (!routePointReq.getActionGroupList().isEmpty()){
+ for (ActionGroupReq actionGroupReq : routePointReq.getActionGroupList()) {
+ for (PointActionReq action : actionGroupReq.getActions()) {
+ if (action.getZoom() != null){
+ action.setZoom(multiple_23(action.getZoom()));
+ //action.setZoom(multiple_6(action.getZoom()));
+ }
}
}
}
}
}
+ public static Double multiple_23(Double zoom){
+ return zoom * CHANSI_H20T;
+ }
+
+ public static Double multiple_6(Double zoom){
+ return zoom * CHANSI_H20_FOCUS;
+ }
+
+ public static Double divided_23(Double zoom){
+ return zoom / CHANSI_H20T;
+ }
+
+ public static Double divided_6(Double zoom){
+ return zoom / CHANSI_H20_FOCUS;
+ }
+
/**
* 初始化数据
*/
--
Gitblit v1.9.3