Merge remote-tracking branch 'origin/dev' into dev

Xiajijian

2025-10-15 b20738c3993b7b8f80c2dee6edf1b4faf7dbecb0

Merge remote-tracking branch 'origin/dev' into dev

 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>

 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);