2222

huimv-admin/src/main/java/com/huimv/guowei/admin/mqtt/EnvControll/MqttStart.java

@@ -20,7 +20,7 @@ public class MqttStart {
     @PostConstruct
     public  void  test() {
         QueryWrapper<EnvDevice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("device_type", 1).eq("farm_id", 21).eq("device_status",1);
+        queryWrapper.eq("device_type", 1);
         List<EnvDevice> list = deviceService.list(queryWrapper);
 
         List<String> chipIds = new ArrayList<>();

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/EnvRegularCallEggServiceImpl.java

@@ -241,7 +241,7 @@ public class EnvRegularCallEggServiceImpl extends ServiceImpl<EnvRegularCallEggM
         for (BaseBuilding baseBuilding : baseBuildings) {
             Integer baseBuildingId = baseBuilding.getId();//笼子id
             QueryWrapper<BaseDuckInfo> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("farm_id", farmId).eq("unit_id", baseBuildingId).like(StringUtils.isNotBlank(duckNum), "duck_num", duckNum);
+            queryWrapper.eq("farm_id", farmId).eq("unit_id", baseBuildingId).like(StringUtils.isNotBlank(duckNum), "duck_num", duckNum).eq("is_cage",0);
             BaseDuckInfo baseDuckInfo = infoMapper.selectOne(queryWrapper);//笼子里的鸭只信息
 
             if (ObjectUtil.isNotEmpty(baseDuckInfo)) {