From 7a76aa4311c86413ff964ed882f592edec5dc470 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 20 五月 2024 21:37:54 +0800
Subject: [PATCH] 1、完善协议实现代码; 2、实体协议数据处理自动任务(报警及状态+定时上报数据); 3、数据库实体id自动付值插件优化。

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_92_A2_Down.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_92_A2_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_92_A2_Down.java
index 5dba686..1193d6b 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_92_A2_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_92_A2_Down.java
@@ -80,7 +80,7 @@
             if(!NumUtil.isPlusIntNumber(cvo.orderNo)){
                 throw new Exception("璁㈠崟鍙峰繀椤绘槸16浣嶆暟瀛�") ;
             }
-            if(cvo.orderNo.length() != 12){
+            if(cvo.orderNo.length() != 16){
                 throw new Exception("璁㈠崟鍙峰繀椤绘槸16浣嶆暟瀛�") ;
             }
 
@@ -103,7 +103,7 @@
             GlCreate.createIcCardNo(cvo.icCardNo, bs, index);
 
             index += 8 ;
-            if(cvo.waterRemain != null){
+            if(cvo.waterRemain == null){
                 cvo.waterRemain = 0.0 ;
             }
             String strTemp = "" + Double.valueOf(cvo.waterRemain * 100).intValue() ;
@@ -121,7 +121,7 @@
                 bs[index++] = 0 ;
             }
 
-            if(cvo.moneyRemain != null){
+            if(cvo.moneyRemain == null){
                 cvo.moneyRemain = 0.0 ;
             }
             strTemp = "" + (Double.valueOf(cvo.moneyRemain * 100)).intValue() ;
@@ -140,7 +140,7 @@
             }
 
 
-            if(cvo.waterPrice != null){
+            if(cvo.waterPrice == null){
                 cvo.waterPrice = 0.0 ;
             }
             strTemp = "" + (Double.valueOf(cvo.waterPrice * 100)).intValue() ;
@@ -159,7 +159,7 @@
             }
 
 
-            if(cvo.elePrice != null){
+            if(cvo.elePrice == null){
                 cvo.elePrice = 0.0 ;
             }
             strTemp = "" + (Double.valueOf(cvo.elePrice * 100)).intValue() ;

--
Gitblit v1.8.0