From 6eae096ba780ca811564929315faf3765dc8fbeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=92=BE=E9=85=92?= Date: Wed, 8 Jan 2025 07:58:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9A=E6=97=B6=E6=8A=A5?= =?UTF-8?q?=E6=96=87=EF=BC=8C=E5=B9=B3=E5=AE=89=E6=8A=A5=E6=B0=B4=E4=BB=B7?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fastbee-admin/src/main/resources/application.yml | 2 +- .../mq/redischannel/consumer/DeviceOtherMsgConsumer.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) 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);