生物防控人员2

huimv-admin/src/main/java/com/huimv/admin/timer/EnvTimer.java

@@ -107,29 +107,30 @@ public class EnvTimer {
                     envDevice.setDeviceStatus(0);
                 } else {
                     envDevice.setDeviceStatus(1);
-                }
-                envDeviceService.updateById(envDevice);
-                List<ShackDatasSensor> sensorDatas = shackDatasDto.getData().getSensorDatas();
-                EnvData envData = new EnvData();
-                for (ShackDatasSensor sensorData : sensorDatas) {
-                    if (sensorData.getId().equals(envDevice.getOhter1())) {
-                        String val = sensorData.getVal();
-                        //TODO 预警
-                        saveTemWarning(val, envWarningThreshold, envDevice, farmId);
-                        envData.setEnvTemp(val);
-                    }
-                    if (sensorData.getId().equals(envDevice.getOhter2())) {
-                        String val = sensorData.getVal();
-                        //TODO 预警
-                        saveHumWarning(val, envWarningThreshold, envDevice, farmId);
-                        envData.setEnvHum(val);
+                    envDeviceService.updateById(envDevice);
+                    List<ShackDatasSensor> sensorDatas = shackDatasDto.getData().getSensorDatas();
+                    EnvData envData = new EnvData();
+                    for (ShackDatasSensor sensorData : sensorDatas) {
+                        if (sensorData.getId().equals(envDevice.getOhter1())) {
+                            String val = sensorData.getVal();
+                            //TODO 预警
+                            saveTemWarning(val, envWarningThreshold, envDevice, farmId);
+                            envData.setEnvTemp(val);
+                        }
+                        if (sensorData.getId().equals(envDevice.getOhter2())) {
+                            String val = sensorData.getVal();
+                            //TODO 预警
+                            saveHumWarning(val, envWarningThreshold, envDevice, farmId);
+                            envData.setEnvHum(val);
+                        }
                     }
+                    envData.setCreateTime(new Date());
+                    envData.setDeviceId(envDevice.getDeviceCode());
+                    envData.setFarmId(farmId);
+                    envData.setUnitId(envDevice.getUnitId());
+                    envDataService.save(envData);
                 }
-                envData.setCreateTime(new Date());
-                envData.setDeviceId(envDevice.getDeviceCode());
-                envData.setFarmId(farmId);
-                envData.setUnitId(envDevice.getUnitId());
-                envDataService.save(envData);
+
             }
         }
     }