qdintc/fishery-back
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 相位差不上数，修复。

Browse Source
This commit is contained in:
tianyongbao
2026-04-10 11:21:36 +08:00
parent 2673eba9ce
commit 881ab2b4a6
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
intc-modules/intc-iot/src/main/java/com/intc/iot/handler/DeviceDataHandler.java
View File

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