咳嗽管家

huimv-farm-environ/src/main/java/com/huimv/environ/eco/schedule/ScheduleTask.java

@@ -40,7 +40,7 @@ public class ScheduleTask {
     @Autowired
     private RestTemplate restTemplate;
     @Autowired
-    private com.huimv.environ.eco.service.EcoDeviceFlowService ecoDeviceFlowService;
+    private EcoDeviceFlowService ecoDeviceFlowService;
     @Autowired
     private EcoDeviceService ecoDeviceService;
     @Autowired
@@ -54,7 +54,7 @@ public class ScheduleTask {
 //    private static String URL = "http://www.0531yun.com/app/GetDeviceData";
 
 //        @Scheduled(cron = "0 0/5 * * * ?")  //每5分钟执行一次
-        @Scheduled(cron = "0 0/1 * * * ?")  //每1分钟执行一次
+//        @Scheduled(cron = "0 0/1 * * * ?")  //每1分钟执行一次
 //    @Scheduled(cron = "*/10 * * * * ?")  //每10秒钟执行一次
     public void autoRunDryList() throws ParseException {
         DateUtil dateUtil = new DateUtil();

huimv-farm-environ/src/main/java/com/huimv/environ/eco/service/impl/BaseRoomServiceImpl.java

@@ -85,7 +85,7 @@ public class BaseRoomServiceImpl extends ServiceImpl<BaseRoomMapper, BaseRoom> i
         baseRoomMapper.setS();
         BaseRoom baseRoom = new BaseRoom();
         if (StrUtil.isBlank(roomId)){
-          roomId  = "157";
+          roomId  = "160";
 //            baseRoom =  this.getOne(new QueryWrapper<BaseRoom>().eq("farm_id",farmId).last("limit 1"));
 //            if (ObjectUtil.isNotEmpty(baseRoom)){
 //                roomId = baseRoom.getId()+"";

huimv-farm-environ/src/main/java/com/huimv/environ/eco/service/impl/SysDayWaterServiceImpl.java

@@ -57,7 +57,7 @@ public class SysDayWaterServiceImpl extends ServiceImpl<SysDayWaterMapper, SysDa
         baseRoomMapper.setS();
         BaseRoom baseRoom ;
         if (roomId == null){
-            roomId = "157";
+            roomId = "160";
            /* baseRoom =  baseRoomMapper.selectOne(new QueryWrapper<BaseRoom>().eq("farm_id",farmId).last("limit 1"));
             if (ObjectUtil.isNotEmpty(baseRoom)){
                 roomId = baseRoom.getId()+"";

huimv-farm-video/src/main/java/com/huimv/video/dhicc/icc/CommonConstant.java

@@ -14,7 +14,7 @@ public class CommonConstant {
     //蛋厂 死鸡通道
 //    public static final String[] SIZhuChannle = {"1003491$1$0$0","1003490$1$0$0"};
     //卖猪的通道1003278$1$0$0
-    public static final String[] MaiZhuChannle = {"1002873$1$0$0"};
+    public static final String[] MaiZhuChannle = {"1002873$1$0$0","1003443$1$0$10"};
 
     //熏蒸
     public static final String[] XunZhengChannle = {"1003444$1$0$0"};

huimv-farm-video/src/main/java/com/huimv/video/video/controller/CameraAreaController.java

@@ -96,10 +96,14 @@ public class CameraAreaController {
             cameraArea.setId(67);
             cameraAreaService.updateById(cameraArea);
         }else if (10000 == farmId){
+            //苍南环保区
             cameraArea.setId(87);
             cameraAreaService.updateById(cameraArea);
+        }else if(10001 == farmId){
+            cameraArea.setId(106);
+            cameraAreaService.updateById(cameraArea);
         }else {
-            cameraAreaService.update(cameraArea, new QueryWrapper<CameraArea>().eq("farm_id", farmId).ne("id",87));
+            cameraAreaService.update(cameraArea, new QueryWrapper<CameraArea>().eq("farm_id", farmId).notIn("id",87,106));
         }
 
         return "成功";