|
|
@@ -356,21 +356,26 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
|
|
|
unitDetailVo.setAvgTemp(envDeviceRecentlyData.get(10).getChipValue());
|
|
|
unitDetailVo.setTargetTemp(envDeviceRecentlyData.get(9).getChipValue());
|
|
|
unitDetailVo.setOutsideTemp(envDeviceRecentlyData.get(8).getChipValue());
|
|
|
+ List<BigDecimal> pressureList =new ArrayList<>();
|
|
|
BigDecimal hum1 =BigDecimal.ZERO;
|
|
|
if (!ObjectUtil.isNull(envDeviceRecentlyData.get(11).getChipValue())){
|
|
|
hum1 = new BigDecimal(envDeviceRecentlyData.get(11).getChipValue());
|
|
|
+ pressureList.add(hum1);
|
|
|
}
|
|
|
BigDecimal hum2 =BigDecimal.ZERO;
|
|
|
if (!ObjectUtil.isNull(envDeviceRecentlyData.get(12).getChipValue())){
|
|
|
hum2 = new BigDecimal(envDeviceRecentlyData.get(12).getChipValue());
|
|
|
+ pressureList.add(hum2);
|
|
|
}
|
|
|
BigDecimal hum3 =BigDecimal.ZERO;
|
|
|
if (!ObjectUtil.isNull(envDeviceRecentlyData.get(13).getChipValue())){
|
|
|
hum3 = new BigDecimal(envDeviceRecentlyData.get(13).getChipValue());
|
|
|
+ pressureList.add(hum3);
|
|
|
}
|
|
|
BigDecimal totalHum = hum1.add(hum2).add(hum3);
|
|
|
- unitDetailVo.setAvgHum(totalHum.divide(new BigDecimal("3"), 1, BigDecimal.ROUND_HALF_UP).toString());
|
|
|
- unitDetailVo.setPressure(envDeviceRecentlyData.get(10).getChipValue());
|
|
|
+
|
|
|
+ unitDetailVo.setAvgHum(totalHum.divide(new BigDecimal(pressureList.size()), 1, BigDecimal.ROUND_HALF_UP).toString());
|
|
|
+ unitDetailVo.setPressure(envDeviceRecentlyData.get(15).getChipValue());
|
|
|
unitDetailVo.setVentilate(envDeviceRecentlyData.get(18).getChipValue());
|
|
|
BigDecimal dayWater = envWaterMapper.getWater(new QueryWrapper<EnvWater>().ge("update_time", timesmorning).eq("farm_id", farmId).eq("unit_id",unitId));
|
|
|
if (ObjectUtil.isNull(dayWater)) {
|
