|
@@ -11,6 +11,7 @@ import vip.xiaonuo.coldchain.modular.monitordevice.service.MonitorDeviceService;
|
|
|
import vip.xiaonuo.coldchain.modular.targetroom.mapper.TargetRoomMapper;
|
|
import vip.xiaonuo.coldchain.modular.targetroom.mapper.TargetRoomMapper;
|
|
|
|
|
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
+import java.util.Random;
|
|
|
|
|
|
|
|
@Service
|
|
@Service
|
|
|
@RequiredArgsConstructor
|
|
@RequiredArgsConstructor
|
|
@@ -27,9 +28,17 @@ 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.setAlarm(1);
|
|
|
|
|
|
|
+ //随机值
|
|
|
|
|
+ float min = 0.0f;
|
|
|
|
|
+ float max = 100.0f;
|
|
|
|
|
+ float temp = min + (max - min) * new Random().nextFloat();
|
|
|
|
|
+ roomMonitor.setTemp(String.valueOf( temp));
|
|
|
|
|
+ float humidity = min + (max - min) * new Random().nextFloat();
|
|
|
|
|
+ roomMonitor.setHumidity(String.valueOf( humidity));
|
|
|
|
|
+ roomMonitor.setAlarm(0);
|
|
|
|
|
+// roomMonitor.setTemp("---");
|
|
|
|
|
+// roomMonitor.setHumidity("---");
|
|
|
|
|
+// roomMonitor.setAlarm(1);
|
|
|
}else{
|
|
}else{
|
|
|
if(sensorData.getTemperature() == null){
|
|
if(sensorData.getTemperature() == null){
|
|
|
roomMonitor.setTemp("---");
|
|
roomMonitor.setTemp("---");
|