luhaojie/agricultural-monitoring-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改定时报文，平安报水价同步

Browse Source
This commit is contained in:
蒾酒
2025-01-08 07:58:31 +08:00
parent ee536f7386
commit 6eae096ba7
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fastbee-admin/src/main/resources/application.yml
View File

@ -62,7 +62,7 @@ server:
spring: spring:
# 环境配置，dev=开发环境，prod=生产环境 # 环境配置，dev=开发环境，prod=生产环境
profiles: profiles:
active: dev # 环境配置，dev=开发环境，prod=生产环境 active: prod # 环境配置，dev=开发环境，prod=生产环境
# 资源信息 # 资源信息
messages: messages:
# 国际化资源文件路径 # 国际化资源文件路径

8
fastbee-gateway/fastbee-mq/src/main/java/com/fastbee/mq/redischannel/consumer/DeviceOtherMsgConsumer.java
View File

@ -135,7 +135,7 @@ public class DeviceOtherMsgConsumer {
Integer addr = data1.getInt("meterAddr"); Integer addr = data1.getInt("meterAddr");
//获取水单价 //获取水单价
Float waterFees = data1.getFloat("waterFees"); BigDecimal waterFees = data1.getBigDecimal("waterFees");
Integer runStatus = null; Integer runStatus = null;
if(valveState==0){ if(valveState==0){
runStatus=2; runStatus=2;
@ -152,7 +152,7 @@ public class DeviceOtherMsgConsumer {
up.set(DeviceReportInfo::getAddr,addr); up.set(DeviceReportInfo::getAddr,addr);
} }
if(waterFees!=null){ if(waterFees!=null){
up.set(DeviceReportInfo::getWaterFree,waterFees); up.set(DeviceReportInfo::getWaterFree,waterFees.divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP));
} }
if(meterIns!=null){ if(meterIns!=null){
up.set(DeviceReportInfo::getInsFlow,meterIns); up.set(DeviceReportInfo::getInsFlow,meterIns);
@ -199,7 +199,7 @@ public class DeviceOtherMsgConsumer {
Integer addr = data1.getInt("meterAddr"); Integer addr = data1.getInt("meterAddr");
//获取水单价 //获取水单价
Float waterFees = data1.getFloat("waterFees"); BigDecimal waterFees = data1.getBigDecimal("waterFees");
Integer runStatus = null; Integer runStatus = null;
if(valveState==0){ if(valveState==0){
runStatus=2; runStatus=2;
@ -216,7 +216,7 @@ public class DeviceOtherMsgConsumer {
up.set(DeviceReportInfo::getAddr,addr); up.set(DeviceReportInfo::getAddr,addr);
} }
if(waterFees!=null){ if(waterFees!=null){
up.set(DeviceReportInfo::getWaterFree,waterFees); up.set(DeviceReportInfo::getWaterFree,waterFees.divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP));
} }
if(meterIns!=null){ if(meterIns!=null){
up.set(DeviceReportInfo::getInsFlow,meterIns); up.set(DeviceReportInfo::getInsFlow,meterIns);