From a5b7ba070f03327f8848593a31c44cc79e7bb24a Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 11 七月 2024 21:53:14 +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/p206V1_0_0/parse/global/GlCreate.java | 52 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 40 insertions(+), 12 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlCreate.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlCreate.java
index 4f13733..d2caefe 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlCreate.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlCreate.java
@@ -12,28 +12,56 @@
String rtuAddr1 = rtuAddr.substring(0, 6) ;
String rtuAddr2 = rtuAddr.substring(6) ;
- index++ ;
ByteUtil.string2BCD_BE(bs, rtuAddr1, index) ;
index += 3 ;
Integer rtuAddr2Int = Integer.parseInt(rtuAddr2) ;
- ByteUtilUnsigned.short2Bytes_BE(bs, rtuAddr2Int.shortValue(), index);
+ ByteUtilUnsigned.short2Bytes_LE(bs, rtuAddr2Int.shortValue(), index);
+ }
+
+ public static void createPw(byte[] bs, int index) throws Exception {
+ bs[index] = 0;
+ bs[index + 1] = 0;
}
public static void createTp(byte[] bs, int index) throws Exception {
- ByteUtil.string2BCD_BE(bs, DateTime.yyMMddhhmmss(), index) ;
+ ByteUtil.string2BCD_LE(bs, DateTime.yyMMddhhmmss(), index) ;
}
- public static void createLen(byte[] bs) throws Exception {
- int len = bs.length + ProtocolConstantV206V1_0_0.lenTail;
- bs[ProtocolConstantV206V1_0_0.dataLenIndex] = (byte)len ;
+ public static void createTp(String yyMMddhhmmss, byte[] bs, int index) throws Exception {
+ ByteUtil.string2BCD_LE(bs, yyMMddhhmmss, index) ;
}
- public static byte[] createCrcTail(byte[] bs) throws Exception {
- int crc = new CRC8_for_2_0().CRC8(bs, ProtocolConstantV206V1_0_0.ctrlIndex, bs.length -1) ;
- bs = new byte[ProtocolConstantV206V1_0_0.lenTail] ;
- bs[0] = (byte)crc ;
- bs[1] = ProtocolConstantV206V1_0_0.P_Tail_Byte ;
- return ByteUtil.bytesMerge(bs, bs) ;
+ public static void createLen(byte[] bsNoTail) throws Exception {
+ int len = bsNoTail.length - ProtocolConstantV206V1_0_0.lenHead2ctrl;
+ bsNoTail[ProtocolConstantV206V1_0_0.dataLenIndex] = (byte)len ;
+ }
+
+
+ /**
+ * 鐢熸垚IC鍗＄紪鐮�
+ * 6瀛楄妭BCD鐮侊紙12浣嶈鏀垮尯鍒掞級 + 2瀛楄妭HEX
+ * @param icCardNo
+ * @param bs
+ * @param index
+ * @throws Exception
+ */
+ public static void createIcCardNo(String icCardNo, byte[] bs, int index) throws Exception {
+ String icCardNo1 = icCardNo.substring(0, 12) ;
+ String icCardNo2 = icCardNo.substring(12) ;
+
+ Integer icCardNo2Int = Integer.parseInt(icCardNo2) ;
+ ByteUtilUnsigned.short2Bytes_LE(bs, icCardNo2Int.shortValue(), index);
+
+ index += 2 ;
+ ByteUtil.string2BCD_LE(bs, icCardNo1, index) ;
+ }
+
+ public static byte[] createCrcTail(byte[] bsNoTail) throws Exception {
+ int crc = new CRC8_for_2_0().CRC8(bsNoTail, ProtocolConstantV206V1_0_0.ctrlIndex, bsNoTail.length -1) ;
+ byte[] bytes = new byte[ProtocolConstantV206V1_0_0.lenTail] ;
+ bytes[0] = (byte)crc ;
+ bytes[1] = ProtocolConstantV206V1_0_0.P_Tail_Byte ;
+ return bytes ;
}
}
--
Gitblit v1.8.0