From b8e8696b61f4a896b16269157e7b85aa7b590009 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 27 三月 2024 17:13:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_C0_Up.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_C0_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_C0_Up.java
index dd61198..67f3520 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_C0_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_C0_Up.java
@@ -43,6 +43,7 @@
String confirmComCode = para.upCode ;
ParseParamsForDownV1_0_1 downCpParams = new ParseParamsForDownV1_0_1() ;
downCpParams.setValue(
+ null,
ProtocolConstantV206V1_0_0.protocolName,
para.rtuAddr,
Command.defaultId,
@@ -50,7 +51,7 @@
null,
null);
//鏋勯�犲簲绛�
- byte[] data = new Cd_02_Down().doParse(downCpParams) ;
+ byte[] data = new Cd_C0_Down().doParse(downCpParams) ;
MidResultToRtu confirmCommand = new MidResultToRtu() ;
confirmCommand.protocolName = para.protocolName ;//鍗忚鍚嶇О
@@ -205,10 +206,10 @@
}
if(hasSignal){
//淇″彿寮哄害锛�1瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~99銆�
- cdData.signal = 0 ;
+ cdData.signalValue = 0 ;
int tpInt = ByteUtil.BCD2Int_LE(bs, index, index) ;
index++ ;
- cdData.signal += tpInt ;
+ cdData.signalValue += tpInt ;
}
if(hasAlarmStatus){
//鎶ヨ鏁版嵁
--
Gitblit v1.8.0