From 4b067b4db5c1f2a068d6e27cc138118810785e2d Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 07 五月 2025 10:47:13 +0800
Subject: [PATCH] 1、创建命令生成器模块，实现部分命令数据生成，还需继续实现其他命令； 2、完善代码。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_10_Down.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_10_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_10_Down.java
index f622e9d..13cc09f 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_10_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_10_Down.java
@@ -30,6 +30,7 @@
MidResultToRtu midRs = new MidResultToRtu() ;
midRs.rtuResultSendWebUrl = para.rtuResultSendWebUrl ;//rtu杩斿洖鍛戒护缁撴灉 鍙戝悜鐩殑鍦皐eb URL
midRs.protocolName = para.protocolName ;//鍗忚鍚嶇О
+ midRs.protocolVersion = para.protocolVersion; //鍗忚鐗堟湰鍙�
midRs.rtuAddr = para.rtuAddr ;//Rtu鍦板潃
midRs.commandId = para.commandId ;//鍛戒护ID锛屽彂璧峰懡浠ょ殑瀹㈡埛绔�(web绔�)鐢熸垚锛屼互鍖归厤鍛戒护缁撴灉
midRs.downCode = para.commandCode ;//涓嬭鍛戒护鍔熻兘鐮�;
@@ -65,7 +66,7 @@
throw new Exception("json杞珻om10Vo涓簄ull");
}
if (cvo.rtuAddr == null) {
- throw new Exception("娴嬭瘯鏂板湴鍧�涓嶈兘涓虹┖");
+ throw new Exception("鍦板潃涓嶈兘涓虹┖");
}
CommonV1 commonV_1 = new CommonV1();
@@ -84,7 +85,7 @@
bsHead[index] = commonV_1.createCtrl((byte) 0, (byte) 0);
index++;
- GlCreate.createRtuAddr(para.rtuAddr, bsHead, index);
+ GlCreate.createRtuAddr4P206(para.rtuAddr, bsHead, index);
index += 5;
ByteUtil.hex2Bytes(para.commandCode, bsHead, index);
@@ -92,7 +93,7 @@
index = 0;
byte[] bs = new byte[13];
- GlCreate.createRtuAddr(cvo.rtuAddr, bs, index);
+ GlCreate.createRtuAddr4P206(cvo.rtuAddr, bs, index);
index += 5;
GlCreate.createPw(bs, index);
index += 2;
@@ -101,7 +102,7 @@
GlCreate.createLen(bytes);//闀垮害鏀惧瓧鑺傛暟缁勪腑
- byte[] bsTail = GlCreate.createCrcTail(bytes);//CRC鍜屽熬鍙犲姞瀛楄妭鏁扮粍涓�
+ byte[] bsTail = GlCreate.createCrcTail4P206(bytes);//CRC鍜屽熬鍙犲姞瀛楄妭鏁扮粍涓�
bytes = ByteUtil.bytesMerge(bytes, bsTail);
--
Gitblit v1.8.0