diff --git a/fastbee-gateway/fastbee-mq/src/main/java/com/fastbee/mq/redischannel/consumer/DeviceOtherMsgConsumer.java b/fastbee-gateway/fastbee-mq/src/main/java/com/fastbee/mq/redischannel/consumer/DeviceOtherMsgConsumer.java index 89b7983..a129cde 100644 --- a/fastbee-gateway/fastbee-mq/src/main/java/com/fastbee/mq/redischannel/consumer/DeviceOtherMsgConsumer.java +++ b/fastbee-gateway/fastbee-mq/src/main/java/com/fastbee/mq/redischannel/consumer/DeviceOtherMsgConsumer.java @@ -120,8 +120,8 @@ public class DeviceOtherMsgConsumer { LambdaUpdateChainWrapper up = new LambdaUpdateChainWrapper<>(deviceReportInfoMapper) .eq(DeviceReportInfo::getSerialNumber, serialNumber); //获取流量计累计用水量/瞬时流量 - Float meterSum = data1.getFloat("meterSum"); - Float meterIns = data1.getFloat("meterIns"); + BigDecimal meterSum = data1.getBigDecimal("meterSum"); + BigDecimal meterIns = data1.getBigDecimal("meterIns"); //获取瞬时功率/累计电量 Float insPower = data1.getFloat("insPower"); @@ -155,10 +155,10 @@ public class DeviceOtherMsgConsumer { up.set(DeviceReportInfo::getWaterFree,waterFees.divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP)); } if(meterIns!=null){ - up.set(DeviceReportInfo::getInsFlow,meterIns); + up.set(DeviceReportInfo::getInsFlow,meterIns.divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP)); } if(meterSum!=null){ - up.set(DeviceReportInfo::getSumFlow,meterSum); + up.set(DeviceReportInfo::getSumFlow,meterSum.divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP)); } //同步数据 up.update(); @@ -186,8 +186,8 @@ public class DeviceOtherMsgConsumer { LambdaUpdateChainWrapper up = new LambdaUpdateChainWrapper<>(deviceReportInfoMapper) .eq(DeviceReportInfo::getSerialNumber, serialNumber); //获取流量计累计用水量/瞬时流量 - Float meterSum = data1.getFloat("meterSum"); - Float meterIns = data1.getFloat("meterIns"); + BigDecimal meterSum = data1.getBigDecimal("meterSum"); + BigDecimal meterIns = data1.getBigDecimal("meterIns"); //获取瞬时功率/累计电量 Float insPower = data1.getFloat("insPower"); Float sumEle = data1.getFloat("sumEle"); @@ -219,10 +219,10 @@ public class DeviceOtherMsgConsumer { up.set(DeviceReportInfo::getWaterFree,waterFees.divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP)); } if(meterIns!=null){ - up.set(DeviceReportInfo::getInsFlow,meterIns); + up.set(DeviceReportInfo::getInsFlow,meterIns.divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP)); } if(meterSum!=null){ - up.set(DeviceReportInfo::getSumFlow,meterSum); + up.set(DeviceReportInfo::getSumFlow,meterSum.divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP)); } //同步数据 up.update();