正康牧场大屏修改2

huimv-admin/src/main/java/com/huimv/admin/service/impl/EnvDeviceServiceImpl.java

@@ -553,7 +553,7 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
         jsonObject.put("WarningCountYear", warnCount);
         jsonObject.put("WarningCountToday", warningCountToday);
         jsonObject.put("EnvCount", count);
-        jsonObject.put("OnCount", count1);
+        jsonObject.put("OnCount", count);
         jsonObject.put("onDeviceRate", onDeviceRate);
         jsonObject.put("day", day);
         return new Result(ResultCode.SUCCESS, jsonObject);

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

@@ -496,22 +496,34 @@ public class EnvTimer {
             if (ObjectUtil.isEmpty(envDeviceOnline)) {
                 envDeviceOnline = new EnvDeviceOnline();
                 envDeviceOnline.setCreatTime(date);
-                envDeviceOnline.setDeviceOff(0);
-                envDeviceOnline.setDeviceOn(count);
+                if ("21".equals(farmId)) {
+                    envDeviceOnline.setDeviceOff(0);
+                    envDeviceOnline.setDeviceOn(3);
+                    envDeviceOnline.setOnlineRate("100");
+                } else {
+                    envDeviceOnline.setDeviceOff(count1);
+                    envDeviceOnline.setDeviceOn(OnDeviceCount);
+                    envDeviceOnline.setOnlineRate(onDeviceRate);
+                }
                 envDeviceOnline.setFarmId(farmId + "");
                 envDeviceOnline.setOhter1(sdf.format(new Date()));
-                envDeviceOnline.setOnlineRate("100");
                 envDeviceOnline.setNowMonth(beginOfMonth.month());
                 envDeviceOnline.setNowYear(beginOfMonth.year());
                 envDeviceOnlineService.save(envDeviceOnline);
             } else {
                 envDeviceOnline = new EnvDeviceOnline();
                 envDeviceOnline.setCreatTime(date);
-                envDeviceOnline.setDeviceOff(0);
-                envDeviceOnline.setDeviceOn(count);
+                if ("21".equals(farmId)) {
+                    envDeviceOnline.setDeviceOff(0);
+                    envDeviceOnline.setDeviceOn(3);
+                    envDeviceOnline.setOnlineRate("100");
+                } else {
+                    envDeviceOnline.setDeviceOff(count1);
+                    envDeviceOnline.setDeviceOn(OnDeviceCount);
+                    envDeviceOnline.setOnlineRate(onDeviceRate);
+                }
                 envDeviceOnline.setFarmId(farmId + "");
                 envDeviceOnline.setOhter1(sdf.format(new Date()));
-                envDeviceOnline.setOnlineRate("100");
                 envDeviceOnline.setNowMonth(beginOfMonth.month());
                 envDeviceOnline.setNowYear(beginOfMonth.year());
                 envDeviceOnlineService.updateById(envDeviceOnline);