From 2673eba9ce82c514037a3f90529e31c5651cdb59 Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Fri, 10 Apr 2026 10:58:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B0=B4=E6=B8=A9=EF=BC=8C=E9=A5=B1?=
 =?UTF-8?q?=E5=92=8C=E5=BA=A6=E7=AD=89=E4=B8=8D=E4=B8=8A=E6=95=B0=EF=BC=8C?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../intc/iot/handler/DeviceDataHandler.java   | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/intc-modules/intc-iot/src/main/java/com/intc/iot/handler/DeviceDataHandler.java b/intc-modules/intc-iot/src/main/java/com/intc/iot/handler/DeviceDataHandler.java
index a186a98..d294fac 100644
--- a/intc-modules/intc-iot/src/main/java/com/intc/iot/handler/DeviceDataHandler.java
+++ b/intc-modules/intc-iot/src/main/java/com/intc/iot/handler/DeviceDataHandler.java
@@ -2096,17 +2096,22 @@ public class DeviceDataHandler {
             // 设备标识（使用 deviceName 作为 serialNum）
             sensorData.setSerialNum(deviceName);
             sensorData.setDeviceName(deviceName);
-
             // 解析传感器数据（根据实际字段映射）
-            if (params.containsKey("dissolvedOxygen")) {
-                Double value =  params.getDouble("dissolvedOxygen");
+            // 支持小写和驼峰命名两种格式
+            if (params.containsKey("dissolvedoxygen") || params.containsKey("dissolvedOxygen")) {
+                Double value = params.containsKey("dissolvedOxygen") ?
+                    params.getDouble("dissolvedOxygen") : params.getDouble("dissolvedoxygen");
                 sensorData.setDissolvedOxygen(value);
             }
+            if (params.containsKey("temperature")) {
+                sensorData.setTemperature(params.getDouble("temperature"));
+            }
             if (params.containsKey("currentTemperature")) {
                 sensorData.setTemperature(params.getDouble("currentTemperature"));
             }
-            if (params.containsKey("dosat")) {
-                Double value = params.getDouble("dosat") ;
+            if (params.containsKey("saturability") || params.containsKey("dosat")) {
+                Double value = params.containsKey("dosat") ?
+                    params.getDouble("dosat") : params.getDouble("saturability");
                 sensorData.setSaturability(value);
             }
             if (params.containsKey("PH")) {
@@ -2115,16 +2120,18 @@ public class DeviceDataHandler {
             if (params.containsKey("salinity")) {
                 sensorData.setSalinity(params.getDouble("salinity"));
             }
-            if (params.containsKey("Treference")) {
-                Double value = params.getDouble("Treference");
+            if (params.containsKey("treference") || params.containsKey("Treference")) {
+                Double value = params.containsKey("Treference") ?
+                    params.getDouble("Treference") : params.getDouble("treference");
                 sensorData.setTreference(value);
             }
-            if (params.containsKey("Tfluorescence")) {
-                Double value = params.getDouble("Tfluorescence");
+            if (params.containsKey("tfluorescence") || params.containsKey("Tfluorescence")) {
+                Double value = params.containsKey("Tfluorescence") ?
+                    params.getDouble("Tfluorescence") : params.getDouble("tfluorescence");
                 sensorData.setTfluorescence(value);
             }
-            if (params.containsKey("Phasedifference")) {
-                sensorData.setPhaseDifference(params.getDouble("Phasedifference"));
+            if (params.containsKey("phasedifference")) {
+                sensorData.setPhaseDifference(params.getDouble("phasedifference"));
             }
             if (params.containsKey("battery")) {
                 sensorData.setBattery(params.getDouble("battery"));