From cd0c9797406acc8a0f1e0a3e3f463a68425e3ef8 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 25 六月 2024 16:50:32 +0800
Subject: [PATCH] 2024-06-25 朱宝民 构造命令、发送命令、结果处理代码放到父类
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_56_Up.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_56_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_56_Up.java
index 7054446..87c4ddc 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_56_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_56_Up.java
@@ -56,19 +56,19 @@
*/
protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
DataV202404 dV1 = (DataV202404)data.getSubData() ;
- DataCd56Vo cdData = new DataCd56Vo() ;
+ DataCd56Vo cdData = new DataCd56Vo(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++ ;
- cdData.waterAlarm = ByteUtilUnsigned.bytes2Short_BE(bs, index) ;
+ cdData.waterAlarm = ByteUtil.BCD2Int_LE(bs, index, index + 1) ;
index += 2 ;
- cdData.moneyAlarm = ByteUtilUnsigned.bytes2Short_BE(bs, index) ;
+ cdData.moneyAlarm = ByteUtil.BCD2Int_LE(bs, index, index + 1) ;
}
}
--
Gitblit v1.8.0