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 10:58:00 +08:00
parent 4c7f879faa
commit e1820f4130
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2096,17 +2096,22 @@ public class DeviceDataHandler {
// 设备标识（使用 deviceName 作为 serialNum） // 设备标识（使用 deviceName 作为 serialNum）
sensorData.setSerialNum(deviceName); sensorData.setSerialNum(deviceName);
sensorData.setDeviceName(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); 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"));
} }
if (params.containsKey("dosat")) { if (params.containsKey("saturability") || params.containsKey("dosat")) {
Double value = params.getDouble("dosat") ; Double value = params.containsKey("dosat") ?
params.getDouble("dosat") : params.getDouble("saturability");
sensorData.setSaturability(value); sensorData.setSaturability(value);
} }
if (params.containsKey("PH")) { if (params.containsKey("PH")) {
@@ -2115,16 +2120,18 @@ public class DeviceDataHandler {
if (params.containsKey("salinity")) { if (params.containsKey("salinity")) {
sensorData.setSalinity(params.getDouble("salinity")); sensorData.setSalinity(params.getDouble("salinity"));
} }
if (params.containsKey("Treference")) { if (params.containsKey("treference") || params.containsKey("Treference")) {
Double value = params.getDouble("Treference"); Double value = params.containsKey("Treference") ?
params.getDouble("Treference") : params.getDouble("treference");
sensorData.setTreference(value); sensorData.setTreference(value);
} }
if (params.containsKey("Tfluorescence")) { if (params.containsKey("tfluorescence") || params.containsKey("Tfluorescence")) {
Double value = params.getDouble("Tfluorescence"); Double value = params.containsKey("Tfluorescence") ?
params.getDouble("Tfluorescence") : params.getDouble("tfluorescence");
sensorData.setTfluorescence(value); sensorData.setTfluorescence(value);
} }
if (params.containsKey("Phasedifference")) { if (params.containsKey("phasedifference")) {
sensorData.setPhaseDifference(params.getDouble("Phasedifference")); sensorData.setPhaseDifference(params.getDouble("phasedifference"));
} }
if (params.containsKey("battery")) { if (params.containsKey("battery")) {
sensorData.setBattery(params.getDouble("battery")); sensorData.setBattery(params.getDouble("battery"));