From f79e169e0f00b253e3df4f9e1f3535c8dcad61f9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 30 七月 2024 17:34:44 +0800
Subject: [PATCH] 完善代码
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_99_Down.java | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 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 9e84e6b..3891c18 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
@@ -7,7 +7,6 @@
import com.dy.common.mw.protocol.p206V1_0_0.CommonV1_0_1;
import com.dy.common.mw.protocol.p206V1_0_0.ParseParamsForDownV1_0_1;
import com.dy.common.mw.protocol.p206V1_0_0.ProtocolConstantV206V1_0_0;
-import com.dy.common.mw.protocol.p206V1_0_0.downVos.Com97Vo;
import com.dy.common.mw.protocol.p206V1_0_0.downVos.Com99Vo;
import com.dy.common.mw.protocol.p206V1_0_0.parse.global.GlCreate;
import com.dy.common.util.ByteUtil;
@@ -80,7 +79,7 @@
String json = obj.toJSONString();
Com99Vo cvo = JSON.parseObject(json, Com99Vo.class) ;
if(cvo == null){
- throw new Exception("json杞珻om97Vo涓簄ull") ;
+ throw new Exception("json杞珻om99Vo涓簄ull") ;
}
if(cvo.icCardNo == null){
throw new Exception("铏氭嫙IC鍗＄紪鍙蜂笉鑳戒负绌�") ;
@@ -98,16 +97,20 @@
throw new Exception("鐢ㄦ按鏃堕暱鍙栧�艰寖鍥存槸0~9999鍒嗛挓") ;
}
- String[] icCardNoGrp = CommonV1_0_1.dealIcCardNo(cvo.icCardNo) ;
- if(icCardNoGrp[0] != null){
- midRs.param = icCardNoGrp[0] ;
- }
+ //String[] icCardNoGrp = CommonV1_0_1.dealIcCardNo(cvo.icCardNo) ;
+ //if(icCardNoGrp[0] != null){
+ // midRs.param = icCardNoGrp[0] ;
+ //}
+ //byte[] bs = new byte[13] ;
+ //index = 0 ;
+ //ByteUtil.string2BCD_LE(bs, icCardNoGrp[1], index) ;
+ byte[] bs = new byte[8] ;
+ GlCreate.createIcCardNo(cvo.icCardNo, bs, 0);
+ bytes = ByteUtil.bytesMerge(bsHead, bs) ;
- byte[] bs = new byte[13] ;
+
+ bs = new byte[4] ;
index = 0 ;
- ByteUtil.string2BCD_LE(bs, icCardNoGrp[1], index) ;
-
- index += 5 ;
Integer money = Double.valueOf(cvo.moneyRemain * 100.0D).intValue() ;
byte[] bTemp = ByteUtil.int2BCD_LE(money) ;
int bTempLen = bTemp.length ;
@@ -122,7 +125,10 @@
for(; count < 4; count++){
bs[index++] = 0 ;
}
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+ bs = new byte[2] ;
+ index = 0 ;
Integer price = Double.valueOf(cvo.waterPrice * 100.0D).intValue() ;
bTemp = ByteUtil.int2BCD_LE(price) ;
bTempLen = bTemp.length ;
@@ -137,8 +143,11 @@
for(; count < 2; count++){
bs[index++] = 0 ;
}
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
+ bs = new byte[2] ;
+ index = 0 ;
bTemp = ByteUtil.int2BCD_LE(cvo.minutes) ;
bTempLen = bTemp.length ;
count = 0 ;
@@ -152,8 +161,7 @@
for(; count < 2; count++){
bs[index++] = 0 ;
}
-
- bytes = ByteUtil.bytesMerge(bsHead, bs) ;
+ bytes = ByteUtil.bytesMerge(bytes, bs) ;
GlCreate.createLen(bytes);//闀垮害鏀惧瓧鑺傛暟缁勪腑
--
Gitblit v1.8.0