|
@@ -967,8 +967,8 @@ public class AlarmMsgServiceImpl extends ServiceImpl<AlarmMsgMapper, AlarmMsg> i
|
|
|
vo.setDischargeSum((chargeInfoVo.getDischarge() == null ? BigDecimal.ZERO : chargeInfoVo.getDischarge()).divide(new BigDecimal("1000000"), 3, RoundingMode.HALF_UP));
|
|
|
}
|
|
|
//电池总量
|
|
|
- long deviceCount = deviceMapper.selectCount(new QueryWrapper<Device>().select("sn").eq("is_delete", 0));
|
|
|
- vo.setDeviceSum(BigDecimal.valueOf(deviceCount * 1.1).setScale(0, BigDecimal.ROUND_HALF_DOWN));
|
|
|
+ long deviceCount = deviceMapper.selectCount(new QueryWrapper<Device>().eq("is_delete", 0));
|
|
|
+ vo.setDeviceSum(BigDecimal.valueOf(deviceCount * 1.05).setScale(0, BigDecimal.ROUND_HALF_DOWN));
|
|
|
//累计数据总量
|
|
|
Device device = deviceMapper.selectOne(new LambdaQueryWrapper<Device>()
|
|
|
.select(Device::getCreateTime)
|