From 1135c89deb50a080152f9086fc7b741c415ecd54 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 12 二月 2025 17:00:14 +0800
Subject: [PATCH] 通信中间件增加功能: 1、实现消息心中; 2、开阀报、关阀报、报警数据都会在消息中间件存入消息; 3、在消息中心注册消息接收者,消息中心周期性向消息接收者推送消息。

---
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealIcRemainMoney.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/p206V1/TkDealIcRemainMoney.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealIcRemainMoney.java
index 2fdc1e6..cac382a 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealIcRemainMoney.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealIcRemainMoney.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