From b20738c3993b7b8f80c2dee6edf1b4faf7dbecb0 Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Wed, 15 Oct 2025 17:15:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-system/src/main/resources/mapper/data/ArdNoFlyZoneMapper.xml | 2 +-
ard-work/src/main/java/com/ard/work/component/websocket/handler/UavAllManager.java | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ard-system/src/main/resources/mapper/data/ArdNoFlyZoneMapper.xml b/ard-system/src/main/resources/mapper/data/ArdNoFlyZoneMapper.xml
index 382aaca..cf49160 100644
--- a/ard-system/src/main/resources/mapper/data/ArdNoFlyZoneMapper.xml
+++ b/ard-system/src/main/resources/mapper/data/ArdNoFlyZoneMapper.xml
@@ -64,7 +64,7 @@
update ard_no_fly_zone
<trim prefix="SET" suffixOverrides=",">
<if test="name != null">name = #{name},</if>
- <if test="geojson != null">geojson = #{geojson},</if>
+ <if test="geojson != null">geojson = #{geojson, typeHandler=com.ard.data.noflyzone.domain.FeatureCollectionTypeHandler},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
diff --git a/ard-work/src/main/java/com/ard/work/component/websocket/handler/UavAllManager.java b/ard-work/src/main/java/com/ard/work/component/websocket/handler/UavAllManager.java
index 4711193..1e74284 100644
--- a/ard-work/src/main/java/com/ard/work/component/websocket/handler/UavAllManager.java
+++ b/ard-work/src/main/java/com/ard/work/component/websocket/handler/UavAllManager.java
@@ -26,6 +26,7 @@
if (uavState != null) {
uavState.calculateFieldAngle();// 计算当前无人机的FieldAngle
}
+ map.put("boxSn", uavState.getBoxSn());
map.put("state", uavState);
TelemetryData uavTelemetryData = UavTelemetryDataCache.getUavTelemetryData(boxSn);
map.put("telemetry", uavTelemetryData);
--
Gitblit v1.9.3