From d469656148db7b11b243fbf260692b8ed4caf0f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Fri, 30 Jan 2026 15:03:55 +0800 Subject: [PATCH] xx --- .../impl/djimqtt/handler/DjiMqttMessageHandler.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ruoyi/device/domain/impl/djimqtt/handler/DjiMqttMessageHandler.java b/src/main/java/com/ruoyi/device/domain/impl/djimqtt/handler/DjiMqttMessageHandler.java index e6489c6..351b20d 100644 --- a/src/main/java/com/ruoyi/device/domain/impl/djimqtt/handler/DjiMqttMessageHandler.java +++ b/src/main/java/com/ruoyi/device/domain/impl/djimqtt/handler/DjiMqttMessageHandler.java @@ -37,14 +37,16 @@ public class DjiMqttMessageHandler { private final List dockDataCallbacks = new ArrayList<>(); /** - * 无人机SN正则表达式（根据文档示例：1581F6Q8X251C00G04H8） + * 无人机SN正则表达式（只匹配以158开头的SN） + * 示例：1581F6Q8X251C00G04H8, 1581F6Q8D247C00GE3KQ */ - private static final Pattern DRONE_SN_PATTERN = Pattern.compile("^[0-9A-Z]{20}$"); + private static final Pattern DRONE_SN_PATTERN = Pattern.compile("^158[0-9A-Z]+$"); /** - * 机场SN正则表达式（根据文档示例：7CTXN5K00B0AXM） + * 机场SN正则表达式（只匹配以7C开头的SN） + * 示例：7CTXN5K00B0AXM */ - private static final Pattern DOCK_SN_PATTERN = Pattern.compile("^[0-9A-Z]{14}$"); + private static final Pattern DOCK_SN_PATTERN = Pattern.compile("^7C[0-9A-Z]+$"); /** * 注册无人机数据回调