From 427d87e5572d72d0e3aaa4364e4f53569222e321 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 25 三月 2025 21:40:05 +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/p206V202404/parse/global/GlCreate.java | 113 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 86 insertions(+), 27 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java
index f428bde..49f7648 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java
@@ -1,12 +1,8 @@
package com.dy.common.mw.protocol.p206V202404.parse.global;
-import com.dy.common.mw.protocol.p206V1_0_0.ProtocolConstantV206V1_0_0;
import com.dy.common.mw.protocol.p206V202404.CommonV202404;
import com.dy.common.mw.protocol.p206V202404.ProtocolConstantV206V202404;
-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 {
/**
@@ -32,10 +28,25 @@
index++ ;
GlCreate.createRtuAddr(rtuAddr, bsHead, index);
- index += 7 ;
+ index += 8 ;
ByteUtil.hex2Bytes(commandCode, bsHead, index) ;
return bsHead ;
+ }
+
+
+ /**
+ * 0xf0闃�闂� 0x00姘存车
+ * @param controllerTypeByHex
+ * @param bs
+ * @param index
+ */
+ public static void createValveOrPump(String controllerTypeByHex, byte[] bs, int index){
+ if(controllerTypeByHex != null && controllerTypeByHex.equals("57")){
+ bs[index] = (byte)0x00 ;
+ }else{
+ bs[index] = (byte)0xF0 ;
+ }
}
/**
@@ -55,6 +66,16 @@
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) ;
}
/**
@@ -95,12 +116,12 @@
}
public static void createDt(byte[] bs, int index) throws Exception {
- bs[index] = Byte.parseByte(DateTime.ss()) ;
- bs[index + 1] = Byte.parseByte(DateTime.mm()) ;
- bs[index + 2] = Byte.parseByte(DateTime.HH()) ;
- bs[index + 3] = Byte.parseByte(DateTime.dd()) ;
- bs[index + 4] = Byte.parseByte(DateTime.MM()) ;
- bs[index + 5] = Byte.parseByte(DateTime.yy()) ;
+ ByteUtil.string2BCD_BE(bs, DateTime.ss(), index) ; ;
+ ByteUtil.string2BCD_BE(bs, DateTime.mm(), index + 1) ;
+ ByteUtil.string2BCD_BE(bs, DateTime.HH(), index + 2) ;
+ ByteUtil.string2BCD_BE(bs, DateTime.dd(), index + 3) ;
+ ByteUtil.string2BCD_BE(bs, DateTime.MM(), index + 4) ;
+ ByteUtil.string2BCD_BE(bs, DateTime.yy(), index + 5) ;
}
@@ -110,31 +131,69 @@
}
public static void createTp(byte[] bs, int index) throws Exception {
- bs[index] = Byte.parseByte(DateTime.ss()) ;
- bs[index + 1] = Byte.parseByte(DateTime.mm()) ;
- bs[index + 2] = Byte.parseByte(DateTime.HH()) ;
- bs[index + 3] = Byte.parseByte(DateTime.dd()) ;
- bs[index + 4] = (byte)(DateTime.week_Int().byteValue() << 5 | Byte.parseByte(DateTime.MM())) ;
- bs[index + 5] = Byte.parseByte(DateTime.yy()) ;
+ ByteUtil.string2BCD_BE(bs, DateTime.ss(), index) ; ;
+ ByteUtil.string2BCD_BE(bs, DateTime.mm(), index + 1) ;
+ ByteUtil.string2BCD_BE(bs, DateTime.HH(), index + 2) ;
+ ByteUtil.string2BCD_BE(bs, DateTime.dd(), index + 3) ;
+
+ byte week = DateTime.week_Int().byteValue() ;
+ byte month = Byte.parseByte(DateTime.MM()) ;
+ if(month < 10){
+ bs[index + 4] = (byte)((week << 5) | month) ;
+ }else{
+ bs[index + 4] = (byte)((week << 5) | 0x10 | (month - 10)) ;
+ }
+
+ ByteUtil.string2BCD_BE(bs, DateTime.yy(), index + 5) ;
}
public static void createS2D(byte[] bs, int index) throws Exception {
- bs[index] = Byte.parseByte(DateTime.ss()) ;
- bs[index + 1] = Byte.parseByte(DateTime.mm()) ;
- bs[index + 2] = Byte.parseByte(DateTime.HH()) ;
- bs[index + 3] = Byte.parseByte(DateTime.dd()) ;
+ ByteUtil.string2BCD_BE(bs, DateTime.ss(), index) ; ;
+ ByteUtil.string2BCD_BE(bs, DateTime.mm(), index + 1) ;
+ ByteUtil.string2BCD_BE(bs, DateTime.HH(), index + 2) ;
+ ByteUtil.string2BCD_BE(bs, DateTime.dd(), index + 3) ;
}
public static void createLen(byte[] bsNoTail) throws Exception {
- int len = bsNoTail.length - ProtocolConstantV206V1_0_0.lenHead2ctrl;
- bsNoTail[ProtocolConstantV206V1_0_0.dataLenIndex] = (byte)len ;
+ int len = bsNoTail.length - ProtocolConstantV206V202404.lenHead2ctrl;
+ bsNoTail[ProtocolConstantV206V202404.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] ;
+ }
}
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] ;
+ int crc = new CRC8_for_2_0().CRC8(bsNoTail, ProtocolConstantV206V202404.ctrlIndex, bsNoTail.length -1) ;
+ byte[] bytes = new byte[ProtocolConstantV206V202404.lenTail] ;
bytes[0] = (byte)crc ;
- bytes[1] = ProtocolConstantV206V1_0_0.P_Tail_Byte ;
+ bytes[1] = ProtocolConstantV206V202404.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[ProtocolConstantV206V202404.UG_lenTail] ;
+ bytes[0] = crcBs[2] ;
+ bytes[1] = crcBs[3] ;
+ bytes[2] = ProtocolConstantV206V202404.P_Tail_Byte ;
+ return bytes ;
+ }
+
+ public static void main(String[] args)throws Exception{
+ byte[] bs = new byte[6] ;
+ createTp(bs, 0) ;
+ String hex = ByteUtil.bytes2Hex(bs,true, 0, 6) ;
+ System.out.println(hex);
+ }
}
--
Gitblit v1.8.0