From 3339af3ec5d084083d27ac03f978687ad026b0a5 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 09 Mar 2026 11:19:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-route/src/main/java/com/ard/route/util/ToolUtils.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 51 insertions(+), 0 deletions(-)
diff --git a/ard-route/src/main/java/com/ard/route/util/ToolUtils.java b/ard-route/src/main/java/com/ard/route/util/ToolUtils.java
index d392f34..dcab57b 100644
--- a/ard-route/src/main/java/com/ard/route/util/ToolUtils.java
+++ b/ard-route/src/main/java/com/ard/route/util/ToolUtils.java
@@ -1,8 +1,11 @@
package com.ard.route.util;
+import com.ard.inspection.domain.ArdPointCloud;
+import com.ard.route.domain.djuav.UavRouteReq;
import java.io.*;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
+import java.util.List;
/**
* 工具类
@@ -84,6 +87,9 @@
// 对象序列化为字节数组
public static byte[] serialize(Object obj) throws IOException {
+ if (obj == null) {
+ return null;
+ }
try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream oos = new ObjectOutputStream(baos)) {
oos.writeObject(obj);
@@ -96,6 +102,13 @@
try (ByteArrayInputStream bais = new ByteArrayInputStream(data);
ObjectInputStream ois = new ObjectInputStream(bais)) {
return ois.readObject();
+ }
+ }
+
+ public static List<ArdPointCloud> deserializeLs(byte[] data) throws IOException, ClassNotFoundException {
+ try (ByteArrayInputStream bais = new ByteArrayInputStream(data);
+ ObjectInputStream ois = new ObjectInputStream(bais)) {
+ return (List<ArdPointCloud>) ois.readObject();
}
}
@@ -125,4 +138,42 @@
return Integer.valueOf(parts[1]);
}
+ /**
+ * 截取字符串
+ * 获取经纬度高度
+ */
+ public static Double getDoublePoint(String str,String type) {
+ if (str == null || str.isEmpty()) {
+ return null;
+ }
+ String[] parts = str.split(",");
+ if ("lon".equals(type)) {
+ return Double.parseDouble(parts[0].trim());
+ }
+ if ("lat".equals(type)){
+ return Double.parseDouble(parts[1].trim());
+ }
+ if ("alt".equals(type)){
+ return Double.parseDouble(parts[2].trim());
+ }
+ return null;
+ }
+
+ /**
+ * 获取航线类型方法
+ */
+ public static String templateTypeData(UavRouteReq uavRouteReq) {
+ if ("waypoint".equals(uavRouteReq.getTemplateType())){
+ return "0";
+ }
+ return "1";
+ }
+
+ /**
+ * 获取无人机类型方法
+ */
+ public static String droneTypeData(UavRouteReq uavRouteReq) {
+ return "0-" + uavRouteReq.getDroneType() + "-0";
+ }
+
}
--
Gitblit v1.9.3