|
|
@@ -29,13 +29,20 @@ public class HmiServiceImpl implements HmiService {
|
|
|
SensorData sensorData = monitorDeviceService.queryLatestDataByDeviceIdAndRoads(roomMonitor.getSensorCode(),roomMonitor.getSensorRoute());
|
|
|
if(sensorData==null){
|
|
|
//随机值
|
|
|
- float min = 0.0f;
|
|
|
- float max = 100.0f;
|
|
|
- float temp = min + (max - min) * new Random().nextFloat();
|
|
|
+ float tmin = -200.0f;
|
|
|
+ float tmax = 200.0f;
|
|
|
+ float hmin = 0.0f;
|
|
|
+ float hmax = 100.0f;
|
|
|
+ float temp = tmin + (tmax - tmin) * new Random().nextFloat();
|
|
|
roomMonitor.setTemp(String.valueOf( temp));
|
|
|
- float humidity = min + (max - min) * new Random().nextFloat();
|
|
|
+ float humidity = hmin + (hmax - hmin) * new Random().nextFloat();
|
|
|
roomMonitor.setHumidity(String.valueOf( humidity));
|
|
|
- roomMonitor.setAlarm(0);
|
|
|
+ roomMonitor.setTd(0.0f);
|
|
|
+ roomMonitor.setTu(10.0f);
|
|
|
+ roomMonitor.setAlarm(Float.parseFloat(roomMonitor.getTemp())>roomMonitor.getTu()?1:0);
|
|
|
+ if (roomMonitor.getAlarm() != 1){
|
|
|
+ roomMonitor.setAlarm(Float.parseFloat(roomMonitor.getTemp())<roomMonitor.getTd()?1:0);
|
|
|
+ }
|
|
|
// roomMonitor.setTemp("---");
|
|
|
// roomMonitor.setHumidity("---");
|
|
|
// roomMonitor.setAlarm(1);
|