From 4fe7ea4fbdc0c45f14d1d8de77e3424f826ba909 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 28 六月 2024 21:39:12 +0800
Subject: [PATCH] 1、靳总协议上行数据处理修改完善; 2、上行数据处理任务修改完善.
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_84_Up.java | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_84_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_84_Up.java
index fe33156..0deb3cb 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_84_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_84_Up.java
@@ -88,35 +88,32 @@
dV1.subData = cdData ;
short index = ProtocolConstantV206V1_0_0.dataIndex ;
- //cdData.opType = bs[index] ;
+ cdData.opType = bs[index] ;
- //index++ ;
- //cdData.cardType = bs[index] ;
+ index++ ;
+ cdData.cardType = bs[index] ;
- //index++ ;
- //cdData.cardAddr = ByteUtil.bytes2Hex(bs, false, index, 4) ;
+ index++ ;
+ cdData.cardAddr = ByteUtil.bytes2Hex_LE(bs, false, index, 4) ;
- //index += 4 ;
+ index += 4 ;
//鐢ㄦ按鎴峰彿鏁版嵁鏍煎紡锛�5瀛楄妭BCD鐮佷綆浣嶅湪鍓嶉珮浣嶅湪鍚庛��
cdData.cardNo = ByteUtil.BCD2String_LE(bs, index, index + 4) ;
index += 5 ;
//鐢ㄦ按鎴蜂綑棰濓細鐢ㄦ埛浣欓4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0.00~999999.99锛屽崟浣嶄负鍏冦��
- cdData.remainMoney = 0.0D ;
int tpInt = ByteUtil.BCD2Int_LE(bs, index, index + 3) ;
- cdData.remainMoney += tpInt/100.0 ;
+ cdData.remainMoney = tpInt/100.0 ;
index += 4 ;
//绱娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999999锛屽崟浣嶄负m3銆�
- cdData.totalAmount = 0.0D ;
tpInt = ByteUtil.BCD2Int_LE(bs, index, index + 4) ;
- cdData.totalAmount += tpInt;
+ cdData.totalAmount = tpInt/100.0;
index += 5 ;
//鐬椂娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999.999锛屽崟浣嶄负m3/h銆�
- cdData.instantAmount = 0.0D ;
tpInt = ByteUtil.BCD2Int_LE(bs, index, index + 4) ;
- cdData.instantAmount += tpInt/1000.0 ;
+ cdData.instantAmount = tpInt/1000.0 ;
index += 5 ;
cdData.alarmVo = GlParse.parseAlarm(bs, index) ;
--
Gitblit v1.8.0