From f5a10d5ae1290d8ceefee143815555d59be6ff9a Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 23 五月 2024 08:50:58 +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_80_Down.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_80_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_80_Down.java
index 873bec4..f6a1152 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_80_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_80_Down.java
@@ -19,6 +19,7 @@
MidResultToRtu midRs = new MidResultToRtu() ;
midRs.protocolName = para.protocolName ;//鍗忚鍚嶇О
+ midRs.rtuResultSendWebUrl = para.rtuResultSendWebUrl ;
midRs.rtuAddr = para.rtuAddr ;//Rtu鍦板潃
midRs.commandId = para.commandId ;//鍛戒护ID锛屽彂璧峰懡浠ょ殑瀹㈡埛绔�(web绔�)鐢熸垚锛屼互鍖归厤鍛戒护缁撴灉
midRs.downCode = para.commandCode ;//涓嬭鍛戒护鍔熻兘鐮�;
@@ -46,10 +47,11 @@
byte[] bytes = GlCreate.createStart2Cd(para.rtuAddr, para.commandCode);
if(para.param != null){
DataCd80_5BVo cdData = (DataCd80_5BVo)para.param ;
- byte[] bs = new byte[2] ;
+ byte[] bs = new byte[3] ;
bs[0] = (byte)(Integer.parseInt(cdData.getControllerType(), 16));
bs[1] = cdData.projectNo.byteValue() ;
- GlCreate.createTp(bs, 3) ;
+ bs[2] = 0x01 ;//01:鎴愬姛 81:澶辫触
+ //GlCreate.createTp(bs, 2) ;
bytes = ByteUtil.bytesMerge(bytes, bs) ;
}else{
throw new Exception("涓嬭鍛戒护鍙傛暟鎹负null") ;
--
Gitblit v1.8.0