From 1fe74a6aba7cc02e6a5c00a227ff815639f825de Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 15 七月 2024 20:52:45 +0800
Subject: [PATCH] 1、实现RTU模拟器，并实现心跳上报、开阀上报、关阀上报； 2、基于RTU模拟器的开关阀上报，设计通信中间件上行数据处理任务的bug;
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_8A_Up.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_8A_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_8A_Up.java
index e3196a5..deaeeed 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_8A_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_8A_Up.java
@@ -83,32 +83,32 @@
*/
protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
DataV202404 dV1 = (DataV202404)data.getSubData() ;
- DataCd8AVo cdData = new DataCd8AVo() ;
+ DataCd8AVo cdData = new DataCd8AVo(CodeV202404.getCodeName(dataCode)) ;
dV1.subData = cdData ;
int index = ProtocolConstantV206V202404.dataIndex ;
cdData.controllerType = ByteUtil.bytes2Hex(bs, false, index, 1) ;
index++ ;
- cdData.projectNo = 0 + bs[index];
+ cdData.projectNo = (int)bs[index];
index++ ;
- int lng = ByteUtil.BCD2Int_BE(bs, index, index + 4) ;
+ Long lng = ByteUtil.BCD2Long_LE(bs, index, index + 4) ;
cdData.lng = lng/1000000.0D;
index += 5 ;
- int lat = ByteUtil.BCD2Int_BE(bs, index, index + 4) ;
+ Long lat = ByteUtil.BCD2Long_LE(bs, index, index + 4) ;
cdData.lat = lat/1000000.0D;
index += 5 ;
- int softVersion = ByteUtil.BCD2Int_BE(bs, index, index + 1) ;
+ int softVersion = ByteUtil.BCD2Int_LE(bs, index, index + 1) ;
cdData.softVersion = softVersion/10.0F;
index += 2 ;
- int hardVersion = ByteUtil.BCD2Int_BE(bs, index, index + 1) ;
+ int hardVersion = ByteUtil.BCD2Int_LE(bs, index, index + 1) ;
cdData.hardVersion = hardVersion/10.0F;
index += 2 ;
- int protocolVersion = ByteUtil.BCD2Int_BE(bs, index, index + 1) ;
+ int protocolVersion = ByteUtil.BCD2Int_LE(bs, index, index + 1) ;
cdData.protocolVersion = protocolVersion/10.0F;
}
--
Gitblit v1.8.0