From 8ffdb9e3170e5ca530b652cb4600046bfb08a925 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期五, 05 一月 2024 14:37:37 +0800
Subject: [PATCH] 2024-01-05 朱宝民 流量计部分接口
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlCreate.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 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..b830c19 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,7 +12,6 @@
String rtuAddr1 = rtuAddr.substring(0, 6) ;
String rtuAddr2 = rtuAddr.substring(6) ;
- index++ ;
ByteUtil.string2BCD_BE(bs, rtuAddr1, index) ;
index += 3 ;
@@ -20,20 +19,25 @@
ByteUtilUnsigned.short2Bytes_BE(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 createLen(byte[] bsNoTail) throws Exception {
+ int len = bsNoTail.length - ProtocolConstantV206V1_0_0.lenHead2ctrl;
+ bsNoTail[ProtocolConstantV206V1_0_0.dataLenIndex] = (byte)len ;
}
- 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 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