From cdce015a7143b5e9d0fb003b80b9aa307906c14b Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 02 十二月 2024 11:48:25 +0800
Subject: [PATCH] 修改升级协议中的bug，帧长度由大端模式改为小端模式
---
pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/RtuUpData.java | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/RtuUpData.java b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/RtuUpData.java
index f3659c2..37a0fc7 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/RtuUpData.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/RtuUpData.java
@@ -1,10 +1,9 @@
package com.dy.testClient.tcpClient;
-import com.dy.common.mw.protocol.p206V1_0_0.CommonV1_0_1;
-import com.dy.common.mw.protocol.p206V1_0_0.ProtocolConstantV206V1_0_0;
-import com.dy.common.mw.protocol.p206V1_0_0.parse.global.GlCreate;
+import com.dy.common.mw.protocol.p206V1.CommonV1;
+import com.dy.common.mw.protocol.p206V1.ProtocolConstantV206V1;
+import com.dy.common.mw.protocol.p206V1.parse.global.GlCreate;
import com.dy.common.util.ByteUtil;
-import com.dy.common.util.ByteUtilUnsigned;
/**
* @Author: liurunyu
@@ -14,21 +13,21 @@
public class RtuUpData {
private static byte[] creatHead(String rtuAddr, String code, byte ctrl)throws Exception {
- byte[] bsHead = new byte[ProtocolConstantV206V1_0_0.lenHead2Code] ;
+ byte[] bsHead = new byte[ProtocolConstantV206V1.lenHead2Code] ;
byte index = 0 ;
- bsHead[index] = ProtocolConstantV206V1_0_0.P_Head_Byte ;
+ bsHead[index] = ProtocolConstantV206V1.P_Head_Byte ;
index++ ;
bsHead[index] = 0 ;//甯ч暱搴�
index++ ;
- bsHead[index] = ProtocolConstantV206V1_0_0.P_Head_Byte ;
+ bsHead[index] = ProtocolConstantV206V1.P_Head_Byte ;
index++ ;
bsHead[index] = ctrl; //鎺у埗鍩熷姛鑳界爜
index++ ;
- GlCreate.createRtuAddr(rtuAddr, bsHead, index);
+ GlCreate.createRtuAddr4P206(rtuAddr, bsHead, index);
index += 5 ;
ByteUtil.hex2Bytes(code, bsHead, index) ;
@@ -52,7 +51,7 @@
GlCreate.createLen(bytes);//闀垮害鏀惧瓧鑺傛暟缁勪腑
- byte[] bsTail = GlCreate.createCrcTail(bytes) ;//CRC鍜屽熬鍙犲姞瀛楄妭鏁扮粍涓�
+ byte[] bsTail = GlCreate.createCrcTail4P206(bytes) ;//CRC鍜屽熬鍙犲姞瀛楄妭鏁扮粍涓�
bytes = ByteUtil.bytesMerge(bytes, bsTail) ;
@@ -105,7 +104,7 @@
GlCreate.createLen(bytes);//闀垮害鏀惧瓧鑺傛暟缁勪腑
- byte[] bsTail = GlCreate.createCrcTail(bytes) ;//CRC鍜屽熬鍙犲姞瀛楄妭鏁扮粍涓�
+ byte[] bsTail = GlCreate.createCrcTail4P206(bytes) ;//CRC鍜屽熬鍙犲姞瀛楄妭鏁扮粍涓�
bytes = ByteUtil.bytesMerge(bytes, bsTail) ;
@@ -196,7 +195,7 @@
GlCreate.createLen(bytes);//闀垮害鏀惧瓧鑺傛暟缁勪腑
- byte[] bsTail = GlCreate.createCrcTail(bytes) ;//CRC鍜屽熬鍙犲姞瀛楄妭鏁扮粍涓�
+ byte[] bsTail = GlCreate.createCrcTail4P206(bytes) ;//CRC鍜屽熬鍙犲姞瀛楄妭鏁扮粍涓�
bytes = ByteUtil.bytesMerge(bytes, bsTail) ;
@@ -209,23 +208,23 @@
* @throws Exception 寮傚父
*/
public static byte[] createCdC0(String rtuAddr) throws Exception {
- CommonV1_0_1 commonV1_0_1 = new CommonV1_0_1() ;
+ CommonV1 commonV_1 = new CommonV1() ;
byte[] bytes ;
- byte[] bsHead = new byte[ProtocolConstantV206V1_0_0.lenHead2Code] ;
+ byte[] bsHead = new byte[ProtocolConstantV206V1.lenHead2Code] ;
byte index = 0 ;
- bsHead[index] = ProtocolConstantV206V1_0_0.P_Head_Byte ;
+ bsHead[index] = ProtocolConstantV206V1.P_Head_Byte ;
index++ ;
bsHead[index] = 0 ;//甯ч暱搴�
index++ ;
- bsHead[index] = ProtocolConstantV206V1_0_0.P_Head_Byte ;
+ bsHead[index] = ProtocolConstantV206V1.P_Head_Byte ;
index++ ;
- bsHead[index] = commonV1_0_1.createCtrl((byte)0x80, (byte)3) ;//鎺у埗鍩熷姛鑳界爜3锛氳嚜鎶ュ抚锛屾祦閲忥紙姘撮噺锛夊弬鏁�
+ bsHead[index] = commonV_1.createCtrl((byte)0x80, (byte)3) ;//鎺у埗鍩熷姛鑳界爜3锛氳嚜鎶ュ抚锛屾祦閲忥紙姘撮噺锛夊弬鏁�
index++ ;
- GlCreate.createRtuAddr(rtuAddr, bsHead, index);
+ GlCreate.createRtuAddr4P206(rtuAddr, bsHead, index);
index += 5 ;
ByteUtil.hex2Bytes("C0", bsHead, index) ;
@@ -278,7 +277,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