正康牧场大屏修改

huimv-admin/src/main/java/com/huimv/admin/common/utils/NumberUtils.java

@@ -37,4 +37,10 @@ public class NumberUtils {
         DecimalFormat df = new DecimalFormat("0.00");
         return df.format(v);
     }
+
+    public static String getNumFloat3(Double min, Double max) {
+        double v = Math.random() * (max - min) + min;
+        DecimalFormat df = new DecimalFormat("0.000");
+        return df.format(v);
+    }
 }

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

@@ -134,7 +134,7 @@ public class EnvTimer {
 //            }
 //        }
 //    }
-
+//    @Scheduled(cron = "0 0/2 * * * ? ")
     @Scheduled(cron = "0 0/59 * * * ?")
     @Transactional
     public void getHuanKongs()  {
@@ -160,8 +160,8 @@ public class EnvTimer {
             envDevice.setUnitId(basePigpen.getId());
             envDevice.setFarmId(farmId);
 
-            String tem = NumberUtils.getNum(17, 23, 1);
-            String hum = NumberUtils.getNum(65, 80, 0);
+            String tem = NumberUtils.getNum(18, 23, 1);
+            String hum = NumberUtils.getNum(50, 70, 0);
             saveTemWarning(tem, envWarningThreshold, envDevice, farmId);
             envData.setEnvTemp(tem);
             saveHumWarning(hum, envWarningThreshold, envDevice, farmId);
@@ -496,22 +496,22 @@ public class EnvTimer {
             if (ObjectUtil.isEmpty(envDeviceOnline)) {
                 envDeviceOnline = new EnvDeviceOnline();
                 envDeviceOnline.setCreatTime(date);
-                envDeviceOnline.setDeviceOff(count1);
-                envDeviceOnline.setDeviceOn(OnDeviceCount);
+                envDeviceOnline.setDeviceOff(0);
+                envDeviceOnline.setDeviceOn(count);
                 envDeviceOnline.setFarmId(farmId + "");
                 envDeviceOnline.setOhter1(sdf.format(new Date()));
-                envDeviceOnline.setOnlineRate(onDeviceRate);
+                envDeviceOnline.setOnlineRate("100");
                 envDeviceOnline.setNowMonth(beginOfMonth.month());
                 envDeviceOnline.setNowYear(beginOfMonth.year());
                 envDeviceOnlineService.save(envDeviceOnline);
             } else {
                 envDeviceOnline = new EnvDeviceOnline();
                 envDeviceOnline.setCreatTime(date);
-                envDeviceOnline.setDeviceOff(count1);
-                envDeviceOnline.setDeviceOn(OnDeviceCount);
+                envDeviceOnline.setDeviceOff(0);
+                envDeviceOnline.setDeviceOn(count);
                 envDeviceOnline.setFarmId(farmId + "");
                 envDeviceOnline.setOhter1(sdf.format(new Date()));
-                envDeviceOnline.setOnlineRate(onDeviceRate);
+                envDeviceOnline.setOnlineRate("100");
                 envDeviceOnline.setNowMonth(beginOfMonth.month());
                 envDeviceOnline.setNowYear(beginOfMonth.year());
                 envDeviceOnlineService.updateById(envDeviceOnline);

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

@@ -34,7 +34,7 @@ public class GasTimer {
         String type = NumberUtils.getNum(1, 5, 0);//loc_type
         for (int i = 1; i < 33; i++) {
 
-            String nh3n = NumberUtils.getNumFloat(0.0, 10.5);//NH3N
+            String nh3n = NumberUtils.getNumFloat3(0.011, 0.200);//NH3N
             String jlm = NumberUtils.getNumFloat(0.0, 10.5);//jlm
             String elht = NumberUtils.getNumFloat(0.0, 10.5);//elht
             String ejel = NumberUtils.getNumFloat(0.0, 10.5);//ejel