From 44a78bc47ab66d6492bc0579f58f24dc1921b5d5 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 03 四月 2025 15:44:30 +0800
Subject: [PATCH] 1、webSocket相关代码进行了注解优化； 2、通信中间件把阀控器上报的阀门状态进行消息推送，前端、小程序可能用到（webSocket推送）。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V2/TkDealIcRemainMoneyV2.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V2/TkDealIcRemainMoneyV2.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V2/TkDealIcRemainMoneyV2.java
index 5e4b6b1..72d5e4a 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V2/TkDealIcRemainMoneyV2.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V2/TkDealIcRemainMoneyV2.java
@@ -130,20 +130,30 @@
public Double remainMoney ; //鍓╀綑閲戦
public void valueFrom(DataCd84Vo vo84, DataCd83OpenVo vo83Op, DataCd83CloseVo vo83Cl){
- if(this.isAll0(this.icCardAddr)){
- this.isVirIcCard = true ;
- }else{
- this.isVirIcCard = false ;
- }
if(vo84 != null){
+ if(this.isAll0(vo84.cardAddr)){
+ this.isVirIcCard = true ;
+ }else{
+ this.isVirIcCard = false ;
+ }
this.icCardAddr = vo84.cardAddr ;
this.icCardNo = vo84.cardNo ;
this.remainMoney = vo84.remainMoney ;
}else if(vo83Op != null){
+ if(this.isAll0(vo83Op.icCardAddr)){
+ this.isVirIcCard = true ;
+ }else{
+ this.isVirIcCard = false ;
+ }
this.icCardAddr = vo83Op.icCardAddr ;
this.icCardNo = vo83Op.icCardNo ;
this.remainMoney = vo83Op.remainMoney ;
}else if(vo83Cl != null){
+ if(this.isAll0(vo83Cl.icCardAddr)){
+ this.isVirIcCard = true ;
+ }else{
+ this.isVirIcCard = false ;
+ }
this.icCardAddr = vo83Cl.icCardAddr ;
this.icCardNo = vo83Cl.icCardNo ;
this.remainMoney = vo83Cl.remainMoney ;
--
Gitblit v1.8.0