From 97e09d2666be44942d06be94e7eb22b1635d2d8f Mon Sep 17 00:00:00 2001
From: Tian jianyong <11429339@qq.com>
Date: Mon, 20 Oct 2025 18:23:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=B8=8D=E5=BF=85=E8=A6=81?=
 =?UTF-8?q?=E7=9A=84=20websocket=20=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README_WEBSOCKET.md                                 |  2 --
 qaup-admin/src/main/resources/application-dev.yml   |  3 ---
 .../datacollector/config/FlightSdkProperties.java   | 13 -------------
 .../datacollector/service/DataCollectorService.java |  5 ++---
 4 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/README_WEBSOCKET.md b/README_WEBSOCKET.md
index 6b2dae50..67a9b35b 100644
--- a/README_WEBSOCKET.md
+++ b/README_WEBSOCKET.md
@@ -67,8 +67,6 @@ data:
       port: 8086        # adxp-adapter端口
       username: dianxin  # 登录用户名
       password: dianxin@123  # 登录密码
-      websocket:
-        enabled: true    # 启用WebSocket连接
 ```
 
 ## 测试工具
diff --git a/qaup-admin/src/main/resources/application-dev.yml b/qaup-admin/src/main/resources/application-dev.yml
index 115795cb..ebd12656 100644
--- a/qaup-admin/src/main/resources/application-dev.yml
+++ b/qaup-admin/src/main/resources/application-dev.yml
@@ -105,9 +105,6 @@ data:
       password: ${ADXP_PASSWORD:dianxin@123}
       # 重连延迟（毫秒）
       reconnect-delay-millis: 3000
-      # WebSocket连接启用
-      websocket:
-        enabled: true
 
     # 无人车厂商数据源配置 - 开发环境
     vehicle-api:
diff --git a/qaup-collision/src/main/java/com/qaup/collision/datacollector/config/FlightSdkProperties.java b/qaup-collision/src/main/java/com/qaup/collision/datacollector/config/FlightSdkProperties.java
index 81496d4d..a48a4eb3 100644
--- a/qaup-collision/src/main/java/com/qaup/collision/datacollector/config/FlightSdkProperties.java
+++ b/qaup-collision/src/main/java/com/qaup/collision/datacollector/config/FlightSdkProperties.java
@@ -33,22 +33,9 @@ public class FlightSdkProperties {
      * 重连延迟（毫秒）
      */
     private long reconnectDelayMillis = 3000L;
-    
-    /**
-     * WebSocket配置
-     */
-    private WebSocketConfig websocket = new WebSocketConfig();
 
     public boolean isConfigurationReady() {
         return host != null && port != null && port > 0
             && username != null && password != null;
     }
-    
-    @Data
-    public static class WebSocketConfig {
-        /**
-         * 是否启用WebSocket连接
-         */
-        private boolean enabled = true;
-    }
 }
\ No newline at end of file
diff --git a/qaup-collision/src/main/java/com/qaup/collision/datacollector/service/DataCollectorService.java b/qaup-collision/src/main/java/com/qaup/collision/datacollector/service/DataCollectorService.java
index 6303f9e9..caec7462 100644
--- a/qaup-collision/src/main/java/com/qaup/collision/datacollector/service/DataCollectorService.java
+++ b/qaup-collision/src/main/java/com/qaup/collision/datacollector/service/DataCollectorService.java
@@ -116,8 +116,7 @@ public class DataCollectorService {
     private void initWebSocketClient() {
         if (adxpFlightServiceWebSocketClient != null && 
             adxpFlightServiceClient != null && 
-            adxpFlightServiceClient.getProperties() != null &&
-            adxpFlightServiceClient.getProperties().getWebsocket().isEnabled()) {
+            adxpFlightServiceClient.getProperties() != null) {
             try {
                 adxpFlightServiceWebSocketClient.addMessageListener(this::handleFlightNotifications);
                 // WebSocket客户端会在PostConstruct时自动连接
@@ -126,7 +125,7 @@ public class DataCollectorService {
                 log.error("初始化WebSocket客户端失败", e);
             }
         } else {
-            log.info("WebSocket客户端未启用或未配置");
+            log.info("WebSocket客户端未配置");
         }
     }