From 656aa4f953eb52502a6414965e46642c31b6e8ee Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 29 四月 2025 15:33:09 +0800
Subject: [PATCH] 设备会在多种功能码上报数据中携带报警与状态数据，这样数据库保存设备报警与状态数据可能很多，为此修改逻辑，当前实现为一设备一个小时内只保存一条报警与状态数据。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/global/GlCreate.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/global/GlCreate.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/global/GlCreate.java
index c4a784d..553c055 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/global/GlCreate.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/global/GlCreate.java
@@ -54,12 +54,13 @@
public static void createLen4PUg(byte[] bytes) throws Exception {
int len = bytes.length - 4;
- byte[] bs = ByteUtil.int2BCD_LE(len) ;
+ byte[] bs = ByteUtil.short2Bytes_LE((short)len) ;
if(bs != null && bs.length == 1){
- bytes[1] = bs[0] ;
+ bytes[1] = 0 ;
+ bytes[2] = bs[0] ;
}else if(bs != null && bs.length > 1){
- bytes[1] = bs[0] ;
- bytes[2] = bs[1] ;
+ bytes[1] = bs[1] ;
+ bytes[2] = bs[0] ;
}
}
@@ -92,9 +93,12 @@
}
public static byte[] createCrcTail4Ug(byte[] bsNoTail) throws Exception {
- int crc = new CRC16().CRC(bsNoTail, 0, bsNoTail.length -1) ;
+ 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[ProtocolConstantV206V1.UG_lenTail] ;
- ByteUtilUnsigned.short2Bytes_BE(bytes, crc, 0);
+ bytes[0] = crcBs[2] ;
+ bytes[1] = crcBs[3] ;
bytes[2] = ProtocolConstantV206V1.P_Tail_Byte ;
return bytes ;
}
--
Gitblit v1.8.0