diff --git a/fastbee-admin/src/main/resources/application.yml b/fastbee-admin/src/main/resources/application.yml index 3dc6abb..e87bcbd 100644 --- a/fastbee-admin/src/main/resources/application.yml +++ b/fastbee-admin/src/main/resources/application.yml @@ -62,7 +62,7 @@ server: spring: # 环境配置,dev=开发环境,prod=生产环境 profiles: - active: dev # 环境配置,dev=开发环境,prod=生产环境 + active: prod # 环境配置,dev=开发环境,prod=生产环境 # 资源信息 messages: # 国际化资源文件路径 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 500ae7f..4800e98 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 @@ -135,7 +135,7 @@ public class DeviceOtherMsgConsumer { Integer addr = data1.getInt("meterAddr"); //获取水单价 - Float waterFees = data1.getFloat("waterFees"); + BigDecimal waterFees = data1.getBigDecimal("waterFees"); Integer runStatus = null; if(valveState==0){ runStatus=2; @@ -152,7 +152,7 @@ public class DeviceOtherMsgConsumer { up.set(DeviceReportInfo::getAddr,addr); } if(waterFees!=null){ - up.set(DeviceReportInfo::getWaterFree,waterFees); + up.set(DeviceReportInfo::getWaterFree,waterFees.divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP)); } if(meterIns!=null){ up.set(DeviceReportInfo::getInsFlow,meterIns); @@ -199,7 +199,7 @@ public class DeviceOtherMsgConsumer { Integer addr = data1.getInt("meterAddr"); //获取水单价 - Float waterFees = data1.getFloat("waterFees"); + BigDecimal waterFees = data1.getBigDecimal("waterFees"); Integer runStatus = null; if(valveState==0){ runStatus=2; @@ -216,7 +216,7 @@ public class DeviceOtherMsgConsumer { up.set(DeviceReportInfo::getAddr,addr); } if(waterFees!=null){ - up.set(DeviceReportInfo::getWaterFree,waterFees); + up.set(DeviceReportInfo::getWaterFree,waterFees.divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP)); } if(meterIns!=null){ up.set(DeviceReportInfo::getInsFlow,meterIns);