|
@@ -27,12 +27,12 @@ public class HmiServiceImpl implements HmiService {
|
|
|
roomMonitor.setAlarm(0);
|
|
roomMonitor.setAlarm(0);
|
|
|
SensorData sensorData = monitorDeviceService.queryLatestDataByDeviceIdAndRoads(roomMonitor.getSensorCode(),roomMonitor.getSensorRoute());
|
|
SensorData sensorData = monitorDeviceService.queryLatestDataByDeviceIdAndRoads(roomMonitor.getSensorCode(),roomMonitor.getSensorRoute());
|
|
|
if(sensorData==null){
|
|
if(sensorData==null){
|
|
|
- roomMonitor.setTemp("//");
|
|
|
|
|
- roomMonitor.setHumidity("//");
|
|
|
|
|
|
|
+ roomMonitor.setTemp("-");
|
|
|
|
|
+ roomMonitor.setHumidity("-");
|
|
|
roomMonitor.setAlarm(1);
|
|
roomMonitor.setAlarm(1);
|
|
|
}else{
|
|
}else{
|
|
|
if(sensorData.getTemperature() == null){
|
|
if(sensorData.getTemperature() == null){
|
|
|
- roomMonitor.setTemp("//");
|
|
|
|
|
|
|
+ roomMonitor.setTemp("-");
|
|
|
}else{
|
|
}else{
|
|
|
roomMonitor.setTemp(sensorData.getTemperature().toString());
|
|
roomMonitor.setTemp(sensorData.getTemperature().toString());
|
|
|
if(roomMonitor.getTd()!=null && roomMonitor.getAlarm()!=1){
|
|
if(roomMonitor.getTd()!=null && roomMonitor.getAlarm()!=1){
|
|
@@ -43,7 +43,7 @@ public class HmiServiceImpl implements HmiService {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
if(sensorData.getHumidity() == null){
|
|
if(sensorData.getHumidity() == null){
|
|
|
- roomMonitor.setHumidity("//");
|
|
|
|
|
|
|
+ roomMonitor.setHumidity("-");
|
|
|
}else{
|
|
}else{
|
|
|
roomMonitor.setHumidity(sensorData.getHumidity().toString());
|
|
roomMonitor.setHumidity(sensorData.getHumidity().toString());
|
|
|
if(roomMonitor.getHd()!=null && roomMonitor.getAlarm()!=1){
|
|
if(roomMonitor.getHd()!=null && roomMonitor.getAlarm()!=1){
|