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