From 45fa66d3263b7cc9f3125d9b427e90503cf410cd Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 07 八月 2024 15:51:34 +0800
Subject: [PATCH] 完善代码
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_A2_Down.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 9db5735..d664159 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
@@ -85,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.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") ;
@@ -103,7 +103,7 @@
if(cvo.year < 24 || cvo.year > 9999){
throw new Exception("璁″垝寮�闃�鏃堕棿---骞翠笉姝ｇ‘") ;
}
- if(cvo.year > 24 && cvo.year < 2024){
+ if(cvo.year > 99 && cvo.year < 2024){
throw new Exception("璁″垝寮�闃�鏃堕棿---骞翠笉姝ｇ‘") ;
}
if(cvo.month == null){
@@ -136,7 +136,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