配置

src/main/java/com/huimv/admin/service/impl/BasePigpenServiceImpl.java

@@ -185,11 +185,9 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
                 jsonObject.put("status", envDevice.getStageType());
                 jsonObject.put("unitId", envDevice.getUnitId());
                 jsonObject.put("type", true);
-
-                Date date = new Date();
                 QueryWrapper<EnvWarning> warningQueryWrapper = new QueryWrapper<>();
-                warningQueryWrapper.eq("farm_id", farmId).eq("unit_id", basePigpenId).ge("update_time", date)
-                        .eq("warning_type", 8)/*.orderByDesc("update_time").last(" limit 1")*/;
+                warningQueryWrapper.eq("farm_id", farmId).eq("unit_id", basePigpenId)/*.ge("update_time", date)*/
+                        .eq("warning_type", 8).orderByDesc("update_time").last(" limit 1");
                 EnvWarning envWarning = envWarningMapper.selectOne(warningQueryWrapper);
                 if (ObjectUtil.isEmpty(envWarning)) {
                     jsonObject.put("warning", null);

src/main/java/com/huimv/admin/service/impl/EnvDayagePeizhiServiceImpl.java

@@ -96,7 +96,6 @@ public class EnvDayagePeizhiServiceImpl extends ServiceImpl<EnvDayagePeizhiMappe
         System.out.println(time);
         EnvDevice envDevice = envDeviceMapper.selectOne(new QueryWrapper<EnvDevice>().eq("device_sort_code", deviceCode).eq("farm_id", farmId));
         envDevice.setDisposeTime(time);
-        envDeviceMapper.updateById(envDevice);
         List<EnvFengPeizhi> timeDayAge1 = envFengPeizhiMapper.selectList(new QueryWrapper<EnvFengPeizhi>().eq("time_feng",timeDayAge));
         for (EnvFengPeizhi envFengPeizhi : timeDayAge1) {
             String fansCtrl = envFengPeizhi.getFansCtrl();
@@ -105,7 +104,7 @@ public class EnvDayagePeizhiServiceImpl extends ServiceImpl<EnvDayagePeizhiMappe
                 return new Result(ResultCode.FAIL,"设备风机数量不等于配置所需！");
             }
         }
-
+        envDeviceMapper.updateById(envDevice);
         //应用的变1
         List<EnvDayagePeizhi> envDayagePeizhis = envDayagePeizhiMapper.selectList(new QueryWrapper<EnvDayagePeizhi>().eq("device_code", deviceCode).eq("time_dayage", time));
         for (EnvDayagePeizhi envDayagePeizhi : envDayagePeizhis) {

src/main/java/com/huimv/admin/service/impl/EnvFengPeizhiServiceImpl.java

@@ -52,12 +52,21 @@ public class EnvFengPeizhiServiceImpl extends ServiceImpl<EnvFengPeizhiMapper, E
                 Map detailMap = new HashMap();
                 detailMap.put("name","风机"+j);
                 detailMap.put("status",fans.charAt(i));
-                detailMap.put("constantSpeed",envDayFengPeizhi.getFanEnable());
-                detailMap.put("timeControl",envDayFengPeizhi.getCycleMode());
-                detailMap.put("changeSpeed",envDayFengPeizhi.getVarFanEnable());
-                detailMap.put("speed",envDayFengPeizhi.getSpeed());
-                detailMap.put("openTime",envDayFengPeizhi.getRunGap());
-                detailMap.put("stopTime",envDayFengPeizhi.getStopGap());
+                if (fans.charAt(i) == '0'){
+                    detailMap.put("constantSpeed",0);
+                    detailMap.put("timeControl",0);
+                    detailMap.put("changeSpeed",0);
+                    detailMap.put("speed",0);
+                    detailMap.put("openTime",0);
+                    detailMap.put("stopTime",0);
+                }else {
+                    detailMap.put("constantSpeed",envDayFengPeizhi.getFanEnable());
+                    detailMap.put("timeControl",envDayFengPeizhi.getCycleMode());
+                    detailMap.put("changeSpeed",envDayFengPeizhi.getVarFanEnable());
+                    detailMap.put("speed",envDayFengPeizhi.getSpeed());
+                    detailMap.put("openTime",envDayFengPeizhi.getRunGap());
+                    detailMap.put("stopTime",envDayFengPeizhi.getStopGap());
+                }
                 detailList.add(detailMap);
                 j++;
             }