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 d294fac..802b3f0 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 @@ -2103,19 +2103,21 @@ public class DeviceDataHandler { 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")); + } else if (params.containsKey("temperature")) { + sensorData.setTemperature(params.getDouble("temperature")); } 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")) { - sensorData.setPh(params.getDouble("PH")); + if (params.containsKey("PH") || params.containsKey("ph") || params.containsKey("Ph")) { + Double value = params.containsKey("PH") ? params.getDouble("PH") + : params.containsKey("Ph") ? params.getDouble("Ph") + : params.getDouble("ph"); + sensorData.setPh(value); } if (params.containsKey("salinity")) { sensorData.setSalinity(params.getDouble("salinity")); @@ -2130,8 +2132,11 @@ public class DeviceDataHandler { params.getDouble("Tfluorescence") : params.getDouble("tfluorescence"); sensorData.setTfluorescence(value); } - if (params.containsKey("phasedifference")) { - sensorData.setPhaseDifference(params.getDouble("phasedifference")); + if (params.containsKey("Phasedifference") || params.containsKey("phaseDifference") || params.containsKey("phasedifference")) { + Double value = params.containsKey("Phasedifference") ? params.getDouble("Phasedifference") + : params.containsKey("phaseDifference") ? params.getDouble("phaseDifference") + : params.getDouble("phasedifference"); + sensorData.setPhaseDifference(value); } if (params.containsKey("battery")) { sensorData.setBattery(params.getDouble("battery"));