From 0ee940c32fb24ec0eaa6548beb476f2beb2cce62 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期四, 01 八月 2024 08:48:40 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_56_Up.java | 10 ++++------
1 files changed, 4 insertions(+), 6 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..10a4c96 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
@@ -3,10 +3,8 @@
import com.dy.common.mw.protocol.*;
import com.dy.common.mw.protocol.p206V202404.*;
-import com.dy.common.mw.protocol.p206V202404.upVos.DataCd50Vo;
import com.dy.common.mw.protocol.p206V202404.upVos.DataCd56Vo;
import com.dy.common.util.ByteUtil;
-import com.dy.common.util.ByteUtilUnsigned;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -56,19 +54,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