From e407fcf19e50ed0972e7262d99da4b3a83d08706 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 11 十月 2024 17:08:23 +0800
Subject: [PATCH] 1、修改协议驱动RTU上行数据解析出错时，RTU上下行数据日志中的RTU地址不正确的bug; 2、83功能码上行数据测试main方法实现。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_99_Down.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_99_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_99_Down.java
index 3891c18..3aff9b9 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_99_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_99_Down.java
@@ -32,6 +32,7 @@
midRs.rtuAddr = para.rtuAddr ;//Rtu鍦板潃
midRs.commandId = para.commandId ;//鍛戒护ID锛屽彂璧峰懡浠ょ殑瀹㈡埛绔�(web绔�)鐢熸垚锛屼互鍖归厤鍛戒护缁撴灉
midRs.downCode = para.commandCode ;//涓嬭鍛戒护鍔熻兘鐮�;
+ midRs.downCodeName = CodeV1_0_1.getCodeName(para.commandCode) ;//涓嬭鍛戒护鍔熻兘鐮佸悕绉�;
midRs.downBuffer = bs ;//涓嬭鍛戒护鏁版嵁
midRs.downBufHex = ByteUtil.bytes2Hex(bs, true) ;//涓嬭鍛戒护鏁版嵁鍗佸叚杩涘埗褰㈠紡
midRs.hasResponse = true ;//鏄惁鏈夊簲绛�
@@ -84,14 +85,14 @@
if(cvo.icCardNo == null){
throw new Exception("铏氭嫙IC鍗＄紪鍙蜂笉鑳戒负绌�") ;
}
- if(cvo.moneyRemain == null){
- throw new Exception("鍓╀綑閲戦涓嶈兘涓虹┖") ;
+ if(cvo.moneyRemain == null || cvo.moneyRemain == 0.0){
+ throw new Exception("鍓╀綑閲戦涓嶈兘涓虹┖鎴栦负0") ;
}
- if(cvo.waterPrice == null){
- throw new Exception("姘翠环涓嶈兘涓虹┖") ;
+ if(cvo.waterPrice == null || cvo.waterPrice == 0.0){
+ throw new Exception("姘翠环涓嶈兘涓虹┖鎴栦负0") ;
}
- if(cvo.minutes == null){
- throw new Exception("鐢ㄦ按鏃堕暱涓嶈兘涓虹┖") ;
+ if(cvo.minutes == null || cvo.minutes == 0.0){
+ throw new Exception("鐢ㄦ按鏃堕暱涓嶈兘涓虹┖鎴栦负0") ;
}
if(cvo.minutes < 0 || cvo.minutes > 9999){
throw new Exception("鐢ㄦ按鏃堕暱鍙栧�艰寖鍥存槸0~9999鍒嗛挓") ;
--
Gitblit v1.8.0