查询

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

@@ -215,22 +215,14 @@ public class BaseBuildingServiceImpl extends ServiceImpl<BaseBuildingMapper, Bas
             resultMap.put("envTemp",envDataVo.getEnvTemp());
             resultMap.put("envHum",envDataVo.getEnvHum());
         }
-        int fanStatus = 0,tpStatus = 0,sprayStatus = 0;
         resultMap.put("energyWater", energyWaterMapper.getUnitDayWater(farmId, unitId));
         resultMap.put("energyElectricity",energyElectricityMapper.getDayUnitElectricity(farmId, unitId));
-        if (envDeviceEquipmentMapper.selectCount(new QueryWrapper<EnvDeviceEquipment>().eq("open_start",1).eq("equipment_type",1).eq("unit_id",unitId)) >= 1) {
-            fanStatus = 1;
-        }
-        if (envDeviceEquipmentMapper.selectCount(new QueryWrapper<EnvDeviceEquipment>().eq("open_start",1).eq("equipment_type",2).eq("unit_id",unitId)) >= 1) {
-            tpStatus = 1;
-        }
-        if (envDeviceEquipmentMapper.selectCount(new QueryWrapper<EnvDeviceEquipment>().eq("open_start",1).eq("equipment_type",3).eq("unit_id",unitId)) >= 1) {
-            sprayStatus = 1;
-        }
-        resultMap.put("fanStatus",fanStatus);
-        resultMap.put("tpStatus",tpStatus);
-        resultMap.put("sprayStatus",sprayStatus);
-
+        List<Integer> unitList = new ArrayList<>();
+        unitList.add(Integer.valueOf(unitId));
+        List<BaseBuilding> baseBuildingList = baseBuildingMapper.selectList(new QueryWrapper<BaseBuilding>().lambda().eq(BaseBuilding::getParentId, unitId));
+        unitList.addAll(baseBuildingList.stream().map(baseBuilding -> baseBuilding.getId()).collect(Collectors.toList()));
+        long deviceNum = envDeviceMapper.selectCount(new QueryWrapper<EnvDevice>().lambda().in(EnvDevice::getUnitId,unitList)) + 5;
+        resultMap.put("deviceNum",deviceNum);
         List<EnvDeviceEquipment> deviceList =envDeviceEquipmentMapper.selectList(new QueryWrapper<EnvDeviceEquipment>().eq("unit_id",unitId).orderByAsc("equipment_port"));
         resultMap.put("deviceList",deviceList);
         return new Result(ResultCode.SUCCESS,resultMap);

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

@@ -196,7 +196,7 @@ public class EnvRegularCallEggServiceImpl extends ServiceImpl<EnvRegularCallEggM
         QueryWrapper<EnvRegularCallEgg> queryWrapper = new QueryWrapper<>();
         Calendar calendar = Calendar.getInstance();
         calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
-        queryWrapper.eq("farm_id", farmId).eq(StringUtils.isNotBlank(duckId), "duck_id", duckId)
+        queryWrapper.eq("farm_id", farmId).eq(StringUtils.isNotBlank(duckId), "duck_id", duckId).orderByDesc("call_date")
         /* .ge("call_date", calendar.getTime())*/;
         QueryWrapper<EnvRegularCallEgg> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("farm_id", farmId).eq(StringUtils.isNotBlank(duckId), "duck_id", duckId);