fix:测试问题修复,ph值。
This commit is contained in:
@@ -2089,41 +2089,33 @@ public class DeviceDataHandler {
|
||||
sensorData.setDeviceName(deviceName);
|
||||
|
||||
// 解析传感器数据(根据实际字段映射)
|
||||
// 支持小写和驼峰命名两种格式
|
||||
if (params.containsKey("dissolvedoxygen") || params.containsKey("dissolvedOxygen")) {
|
||||
Double value = params.containsKey("dissolvedOxygen") ?
|
||||
params.getDouble("dissolvedOxygen") : params.getDouble("dissolvedoxygen");
|
||||
if (params.containsKey("dissolvedOxygen")) {
|
||||
Double value = 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("saturability") || params.containsKey("dosat")) {
|
||||
Double value = params.containsKey("dosat") ?
|
||||
params.getDouble("dosat") : params.getDouble("saturability");
|
||||
if (params.containsKey("dosat")) {
|
||||
Double value = params.getDouble("dosat") ;
|
||||
sensorData.setSaturability(value);
|
||||
}
|
||||
if (params.containsKey("ph")) {
|
||||
sensorData.setPh(params.getDouble("ph"));
|
||||
if (params.containsKey("PH")) {
|
||||
sensorData.setPh(params.getDouble("PH"));
|
||||
}
|
||||
if (params.containsKey("salinity")) {
|
||||
sensorData.setSalinity(params.getDouble("salinity"));
|
||||
}
|
||||
if (params.containsKey("treference") || params.containsKey("Treference")) {
|
||||
Double value = params.containsKey("Treference") ?
|
||||
params.getDouble("Treference") : params.getDouble("treference");
|
||||
if (params.containsKey("Treference")) {
|
||||
Double value = params.getDouble("Treference");
|
||||
sensorData.setTreference(value);
|
||||
}
|
||||
if (params.containsKey("tfluorescence") || params.containsKey("Tfluorescence")) {
|
||||
Double value = params.containsKey("Tfluorescence") ?
|
||||
params.getDouble("Tfluorescence") : params.getDouble("tfluorescence");
|
||||
if (params.containsKey("Tfluorescence")) {
|
||||
Double value = 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"));
|
||||
|
||||
Reference in New Issue
Block a user