From cb5972493e140b26afef9edbe1eea6107c65a8d7 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期二, 15 十月 2024 17:58:33 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_A2_Down.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_A2_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_A2_Down.java
index 3a09630..d5a3edb 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_A2_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_A2_Down.java
@@ -33,6 +33,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 ;//鏄惁鏈夊簲绛�
@@ -85,14 +86,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.waterAmount == null){
- throw new Exception("棰勭敤姘撮噺涓嶈兘涓虹┖") ;
+ if(cvo.waterAmount == null || cvo.waterAmount == 0.0){
+ throw new Exception("棰勭敤姘撮噺涓嶈兘涓虹┖鎴栦负0") ;
}
if(cvo.waterAmount < 0 || cvo.waterAmount > 9999){
throw new Exception("棰勭敤姘撮噺鍙栧�艰寖鍥存槸0~9999m3") ;
@@ -136,7 +137,7 @@
// midRs.param = icCardNoGrp[0] ;
//}
//ByteUtil.string2BCD_LE(bs, icCardNoGrp[1], index) ;
- byte[] bs = new byte[16] ;
+ byte[] bs = new byte[8] ;
index = 0 ;
GlCreate.createIcCardNo(cvo.icCardNo, bs, 0);
bytes = ByteUtil.bytesMerge(bsHead, bs) ;
--
Gitblit v1.8.0