From 70aeac289c132085e91d59dc82bc1facd41889fa Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 24 二月 2025 15:33:53 +0800
Subject: [PATCH] 有关表阀一体机（王江海制定）通信协议： 1、根据新版本协议，解析部分更新； 2、根据测试一体阀协议数据处理需求与逻辑，进行表阀一体机数据处理。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_80_Down.java | 7 +++++--
1 files changed, 5 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 fc8e872..1ed7311 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,9 +19,12 @@
MidResultToRtu midRs = new MidResultToRtu() ;
midRs.protocolName = para.protocolName ;//鍗忚鍚嶇О
+ midRs.protocolVersion = para.protocolVersion ;//鍗忚鐗堟湰鍙�
+ midRs.rtuResultSendWebUrl = para.rtuResultSendWebUrl ;
midRs.rtuAddr = para.rtuAddr ;//Rtu鍦板潃
midRs.commandId = para.commandId ;//鍛戒护ID锛屽彂璧峰懡浠ょ殑瀹㈡埛绔�(web绔�)鐢熸垚锛屼互鍖归厤鍛戒护缁撴灉
midRs.downCode = para.commandCode ;//涓嬭鍛戒护鍔熻兘鐮�;
+ midRs.downCodeName = CodeV202404.getCodeName(para.commandCode) ;//涓嬭鍛戒护鍔熻兘鐮佸悕绉�;
midRs.downBuffer = bs ;//涓嬭鍛戒护鏁版嵁
midRs.downBufHex = ByteUtil.bytes2Hex(bs, true) ;//涓嬭鍛戒护鏁版嵁鍗佸叚杩涘埗褰㈠紡
midRs.hasResponse = false ;//鏄惁鏈夊簲绛�
@@ -46,10 +49,10 @@
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, 2) ;
+ bs[2] = 0x01 ;//01:鎴愬姛 81:澶辫触
bytes = ByteUtil.bytesMerge(bytes, bs) ;
}else{
throw new Exception("涓嬭鍛戒护鍙傛暟鎹负null") ;
--
Gitblit v1.8.0