From f5658e38d9aaec4fc002f22938646343a7e86c81 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 26 六月 2024 21:40:27 +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 | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 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 a14fc36..e4fd9cd 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
@@ -3,6 +3,7 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V1_0_0.*;
import com.dy.common.mw.protocol.p206V1_0_0.parse.global.GlParse;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd84Vo;
import com.dy.common.util.ByteUtil;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -43,6 +44,7 @@
String confirmComCode = para.upCode ;
ParseParamsForDownV1_0_1 downCpParams = new ParseParamsForDownV1_0_1() ;
downCpParams.setValue(
+ null,
ProtocolConstantV206V1_0_0.protocolName,
para.rtuAddr,
Command.defaultId,
@@ -83,13 +85,22 @@
protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
DataV1_0_1 dV1 = (DataV1_0_1)data.getSubData() ;
DataCd84Vo cdData = new DataCd84Vo() ;
- dV1.dataCd84Vo = cdData ;
+ dV1.subData = cdData ;
short index = ProtocolConstantV206V1_0_0.dataIndex ;
- //鐢ㄦ按鎴峰彿鏁版嵁鏍煎紡锛�5瀛楄妭BCD鐮佷綆浣嶅湪鍓嶉珮浣嶅湪鍚庛��
- cdData.clientNum = ByteUtil.BCD2String_LE(bs, index, index + 4) ;
- index += 5 ;
+ cdData.opType = bs[index] ;
+ index++ ;
+ cdData.cardType = bs[index] ;
+
+ index++ ;
+ cdData.cardAddr = ByteUtil.bytes2Hex(bs, false, 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) ;
@@ -141,6 +152,11 @@
index++ ;
cdData.instantAmount += tpInt * 100000.0 ;
+ cdData.alarmVo = GlParse.parseAlarm(bs, index) ;
+ index += 2 ;
+ cdData.stateVo = GlParse.parseState(bs, index) ;
+ index += 2 ;
+
//鎺у埗鍣ㄦ椂閽�
cdData.rtuDt = GlParse.parseTp(bs, index) ;
//index += 6 ;
--
Gitblit v1.8.0