From 5fcdef2e8eec55221bb65a7a2cf91a4be7cc89ac Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 02 十二月 2024 16:41:11 +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/p206V2/parse/global/GlCreate.java | 43 +++++++++++++++++++++++++++++++++++++------
1 files changed, 37 insertions(+), 6 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 d57ca14..eb37b70 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,10 +1,8 @@
package com.dy.common.mw.protocol.p206V2.parse.global;
+import com.dy.common.mw.protocol.p206V1.ProtocolConstantV206V1;
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 {
@@ -17,7 +15,7 @@
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 +24,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 {
@@ -46,6 +55,17 @@
bsNoTail[ProtocolConstantV206V2.dataLenIndex] = (byte)len ;
}
+ public static void createLen4PUg(byte[] bytes) throws Exception {
+ int len = bytes.length - 4;
+ byte[] bs = ByteUtil.short2Bytes_LE((short)len) ;
+ if(bs != null && bs.length == 1){
+ bytes[1] = 0 ;
+ bytes[2] = bs[0] ;
+ }else if(bs != null && bs.length > 1){
+ bytes[1] = bs[1] ;
+ bytes[2] = bs[0] ;
+ }
+ }
/**
* 鐢熸垚IC鍗＄紪鐮�
@@ -66,11 +86,22 @@
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().CRC16_table(bsNoTail, 0, bsNoTail.length -1) ;
+ byte[] crcBs = new byte[4] ;
+ ByteUtil.int2Bytes_BE(crcBs, crc, 0);
+ byte[] bytes = new byte[ProtocolConstantV206V2.UG_lenTail] ;
+ bytes[0] = crcBs[2] ;
+ bytes[1] = crcBs[3] ;
+ bytes[2] = ProtocolConstantV206V1.P_Tail_Byte ;
+ return bytes ;
+ }
}
--
Gitblit v1.8.0