From bda423b1aae1d5322116511651ae03a54cdcd231 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 26 十一月 2024 17:25:39 +0800
Subject: [PATCH] 1、几个测试模块系统的log4j.xml配置中的编码修改； 2、RTU升级模拟器增加命令行设置服务端IP和端口功能； 3、应王江海要求，井电双控协议中也实现远程升级功能，因井电双控协议、阀控器协议不同，而双方协议中的升级子协议相同，所以通信中间件做增量开发、适应性修改，以适应这种混合协议情况，同时也提高通信中间件运行效率。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/global/GlCreate.java | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/global/GlCreate.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/global/GlCreate.java
index a20b2f3..9875718 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/global/GlCreate.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/global/GlCreate.java
@@ -1,23 +1,20 @@
package com.dy.common.mw.protocol.p206V2.parse.global;
import com.dy.common.mw.protocol.p206V2.ProtocolConstantV206V2;
-import com.dy.common.util.ByteUtil;
-import com.dy.common.util.ByteUtilUnsigned;
-import com.dy.common.util.CRC8_for_2_0;
-import com.dy.common.util.DateTime;
+import com.dy.common.util.*;
public class GlCreate {
- public static byte createHead(byte[] bsHead) throws Exception {
+ public static byte createHead(Short protocolVersion, byte[] bsHead) throws Exception {
byte index = 0;
bsHead[index++] = ProtocolConstantV206V2.P_Head_Byte;
bsHead[index++] = 0;//甯ч暱搴�
- bsHead[index++] = ProtocolConstantV206V2.protocolVer.byteValue();
+ bsHead[index++] = protocolVersion.byteValue();
bsHead[index] = ProtocolConstantV206V2.P_Head_Byte;
return index ;
}
- public static void createRtuAddr(String rtuAddr, byte[] bs, int index) throws Exception {
+ public static void createRtuAddr4P206(String rtuAddr, byte[] bs, int index) throws Exception {
String rtuAddr1 = rtuAddr.substring(0, 6) ;
String rtuAddr2 = rtuAddr.substring(6) ;
@@ -26,6 +23,17 @@
Integer rtuAddr2Int = Integer.parseInt(rtuAddr2) ;
ByteUtilUnsigned.short2Bytes_LE(bs, rtuAddr2Int.shortValue(), index);
+ }
+
+ /**
+ * 涓哄崌绾у崗璁�
+ * @param rtuAddr
+ * @param bs
+ * @param index
+ * @throws Exception
+ */
+ public static void createRtuAddr4PUg(String rtuAddr, byte[] bs, int index) throws Exception {
+ ByteUtil.string2BCD_BE(bs, rtuAddr, index) ;
}
public static void createPw(byte[] bs, int index) throws Exception {
@@ -66,11 +74,19 @@
ByteUtil.string2BCD_LE(bs, icCardNo1, index) ;
}
- public static byte[] createCrcTail(byte[] bsNoTail) throws Exception {
+ public static byte[] createCrcTail4P206(byte[] bsNoTail) throws Exception {
int crc = new CRC8_for_2_0().CRC8(bsNoTail, ProtocolConstantV206V2.ctrlIndex, bsNoTail.length -1) ;
byte[] bytes = new byte[ProtocolConstantV206V2.lenTail] ;
bytes[0] = (byte)crc ;
bytes[1] = ProtocolConstantV206V2.P_Tail_Byte ;
return bytes ;
}
+
+ public static byte[] createCrcTail4Ug(byte[] bsNoTail) throws Exception {
+ int crc = new CRC16().CRC(bsNoTail, 0, bsNoTail.length -1) ;
+ byte[] bytes = new byte[ProtocolConstantV206V2.UG_lenTail] ;
+ ByteUtilUnsigned.short2Bytes_BE(bytes, crc, 0);
+ bytes[2] = ProtocolConstantV206V2.P_Tail_Byte ;
+ return bytes ;
+ }
}
--
Gitblit v1.8.0