From d5dab07dc674de7edbbc1bd6ade0486f54fbdb26 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 06 五月 2025 19:19:35 +0800
Subject: [PATCH] 1、实现万用token（0000-0000-1234-9876-5）； 2、web端单独实现命令结果等待器，并修改相关部分； 3、web端实现透传命令； 4、修改一些不当注释； 5、优化一些代码。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java | 199 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 199 insertions(+), 0 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
new file mode 100644
index 0000000..49f7648
--- /dev/null
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java
@@ -0,0 +1,199 @@
+package com.dy.common.mw.protocol.p206V202404.parse.global;
+
+import com.dy.common.mw.protocol.p206V202404.CommonV202404;
+import com.dy.common.mw.protocol.p206V202404.ProtocolConstantV206V202404;
+import com.dy.common.util.*;
+
+public class GlCreate {
+ /**
+ * 6瀛楄妭BCD鐮侊紙12浣嶈鏀垮尯鍒掞級 + 2瀛楄妭HEX
+ * @param rtuAddr 鎺у埗鍣ㄥ湴鍧�
+ * @param commandCode 鍔熻兘鐮�
+ * @throws Exception
+ */
+ public static byte[] createStart2Cd(String rtuAddr, String commandCode) throws Exception {
+ CommonV202404 commonV202404 = new CommonV202404() ;
+ byte[] bsHead = new byte[ProtocolConstantV206V202404.lenHead2Code] ;
+ byte index = 0 ;
+ bsHead[index] = ProtocolConstantV206V202404.P_Head_Byte ;
+
+ index++ ;
+ bsHead[index] = 0 ;//甯ч暱搴�
+
+ index++ ;
+ bsHead[index] = ProtocolConstantV206V202404.P_Head_Byte ;
+
+ index++ ;
+ bsHead[index] = commonV202404.createCtrl((byte)0, (byte)0) ;
+
+ index++ ;
+ GlCreate.createRtuAddr(rtuAddr, bsHead, index);
+ 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 ;
+ }
+ }
+
+ /**
+ * 鐢熸垚鎺у埗鍣ㄥ湴鍧�
+ * 6瀛楄妭BCD鐮侊紙12浣嶈鏀垮尯鍒掞級 + 2瀛楄妭HEX
+ * @param rtuAddr
+ * @param bs
+ * @param index
+ * @throws Exception
+ */
+ public static void createRtuAddr(String rtuAddr, byte[] bs, int index) throws Exception {
+ String rtuAddr1 = rtuAddr.substring(0, 12) ;
+ String rtuAddr2 = rtuAddr.substring(12) ;
+
+ ByteUtil.string2BCD_BE(bs, rtuAddr1, index) ;
+ index += 6 ;
+
+ 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) ;
+ }
+
+ /**
+ * 鐢熸垚IC鍗″湴鍧�
+ * @param icCardAddr
+ * @param bs
+ * @param index
+ * @throws Exception
+ */
+ public static void createIcCardAddr(String icCardAddr, byte[] bs, int index) throws Exception {
+ String s1 = icCardAddr.substring(0, 2) ;
+ String s2 = icCardAddr.substring(2, 4) ;
+ String s3 = icCardAddr.substring(4, 6) ;
+ String s4 = icCardAddr.substring(6, 8) ;
+ bs[index++] = (byte) (Integer.parseInt(s1, 16)) ;
+ bs[index++] = (byte) (Integer.parseInt(s2, 16)) ;
+ bs[index++] = (byte) (Integer.parseInt(s3, 16)) ;
+ bs[index++] = (byte) (Integer.parseInt(s4, 16)) ;
+ }
+
+ /**
+ * 鐢熸垚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) ;
+
+ ByteUtil.string2BCD_BE(bs, icCardNo1, index) ;
+ index += 6 ;
+
+ Integer icCardNo2Int = Integer.parseInt(icCardNo2) ;
+ ByteUtilUnsigned.short2Bytes_LE(bs, icCardNo2Int.shortValue(), index);
+ }
+
+ public static void createDt(byte[] bs, int index) throws Exception {
+ 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) ;
+ }
+
+
+ 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.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 {
+ 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 - 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, ProtocolConstantV206V202404.ctrlIndex, bsNoTail.length -1) ;
+ byte[] bytes = new byte[ProtocolConstantV206V202404.lenTail] ;
+ bytes[0] = (byte)crc ;
+ 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