From d38bb7f88d0c499265e6da62a52686a654834daa Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期六, 03 八月 2024 08:59:29 +0800
Subject: [PATCH] 2024-08-03 朱宝民 优化获取命令日志历史记录接口
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_99_Down.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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 f017296..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
@@ -79,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鍗＄紪鍙蜂笉鑳戒负绌�") ;
@@ -106,9 +106,11 @@
//ByteUtil.string2BCD_LE(bs, icCardNoGrp[1], index) ;
byte[] bs = new byte[8] ;
GlCreate.createIcCardNo(cvo.icCardNo, bs, 0);
+ bytes = ByteUtil.bytesMerge(bsHead, bs) ;
- index += 5 ;
+ bs = new byte[4] ;
+ index = 0 ;
Integer money = Double.valueOf(cvo.moneyRemain * 100.0D).intValue() ;
byte[] bTemp = ByteUtil.int2BCD_LE(money) ;
int bTempLen = bTemp.length ;
@@ -123,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 ;
@@ -138,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 ;
@@ -153,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