From a36741516724aa9e266ab898beb9afb5bca9c92d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= <sunpengchina85@gmail.com>
Date: Wed, 11 Feb 2026 17:07:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=8D=87=E9=99=8D=E6=9E=B6?=
 =?UTF-8?q?=20X=E8=BD=B4=20Y=E8=BD=B4=E7=9A=84=E8=8E=B7=E5=8F=96=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TuohengBufferDeviceImpl.java | 43 +++++++++++--------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/service/impl/TuohengBufferDeviceImpl.java b/src/main/java/com/ruoyi/device/service/impl/TuohengBufferDeviceImpl.java
index 83accd9..b082b66 100644
--- a/src/main/java/com/ruoyi/device/service/impl/TuohengBufferDeviceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/TuohengBufferDeviceImpl.java
@@ -486,35 +486,42 @@ public class TuohengBufferDeviceImpl implements IBufferDeviceService {
 
             // 设置机场设备自检数据（升降架、X轴夹器、Y轴夹器）
             log.info("---------- 解析机场设备自检数据 ----------");
-            telemetry.get(TuohengDeviceTelemetry.LIFTER_STATUS)
-                    .ifPresent(value -> {
+
+            // 升降架状态，取不到值时默认为 NORMAL
+            String elevatorPosition = telemetry.get(TuohengDeviceTelemetry.LIFTER_STATUS)
+                    .map(value -> {
                         Integer lifterStatus = value.getValue();
                         log.info("LIFTER_STATUS 升降架状态原始值: {}", lifterStatus);
                         // 0=正常, 非0=异常
-                        String elevatorPosition = (lifterStatus != null && lifterStatus == 0) ? "NORMAL" : "ABNORMAL";
-                        dto.setElevatorPosition(elevatorPosition);
-                        log.info("设置升降架位置: {}", elevatorPosition);
-                    });
+                        return (lifterStatus != null && lifterStatus == 0) ? "NORMAL" : "ABNORMAL";
+                    })
+                    .orElse("NORMAL");
+            dto.setElevatorPosition(elevatorPosition);
+            log.info("设置升降架位置: {}", elevatorPosition);
 
-            telemetry.get(TuohengDeviceTelemetry.HOLDER_X_STATUS)
-                    .ifPresent(value -> {
+            // X轴夹器状态，取不到值时默认为 NORMAL
+            String xAxisClampStatus = telemetry.get(TuohengDeviceTelemetry.HOLDER_X_STATUS)
+                    .map(value -> {
                         Integer holderXStatus = value.getValue();
                         log.info("HOLDER_X_STATUS X轴夹器状态原始值: {}", holderXStatus);
                         // 0=正常, 非0=异常
-                        String xAxisClampStatus = (holderXStatus != null && holderXStatus == 0) ? "NORMAL" : "ABNORMAL";
-                        dto.setXAxisClampStatus(xAxisClampStatus);
-                        log.info("设置X轴夹器状态: {}", xAxisClampStatus);
-                    });
+                        return (holderXStatus != null && holderXStatus == 0) ? "NORMAL" : "ABNORMAL";
+                    })
+                    .orElse("NORMAL");
+            dto.setXAxisClampStatus(xAxisClampStatus);
+            log.info("设置X轴夹器状态: {}", xAxisClampStatus);
 
-            telemetry.get(TuohengDeviceTelemetry.HOLDER_Y_STATUS)
-                    .ifPresent(value -> {
+            // Y轴夹器状态，取不到值时默认为 NORMAL
+            String yAxisClampStatus = telemetry.get(TuohengDeviceTelemetry.HOLDER_Y_STATUS)
+                    .map(value -> {
                         Integer holderYStatus = value.getValue();
                         log.info("HOLDER_Y_STATUS Y轴夹器状态原始值: {}", holderYStatus);
                         // 0=正常, 非0=异常
-                        String yAxisClampStatus = (holderYStatus != null && holderYStatus == 0) ? "NORMAL" : "ABNORMAL";
-                        dto.setYAxisClampStatus(yAxisClampStatus);
-                        log.info("设置Y轴夹器状态: {}", yAxisClampStatus);
-                    });
+                        return (holderYStatus != null && holderYStatus == 0) ? "NORMAL" : "ABNORMAL";
+                    })
+                    .orElse("NORMAL");
+            dto.setYAxisClampStatus(yAxisClampStatus);
+            log.info("设置Y轴夹器状态: {}", yAxisClampStatus);
 
             // 填充无人机状态信息
             if (aircraftIotDeviceId != null) {