From e158b25218fa8991588cd26cbf46470e9c847945 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期日, 09 十月 2022 17:09:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/netty/constant/FireDataType.java | 2 +-
src/main/java/com/zy/core/netty/handle/PackageServerHandler.java | 3 ++-
src/main/java/com/zy/core/netty/domain/fire/Fire_3030.java | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/core/netty/constant/FireDataType.java b/src/main/java/com/zy/core/netty/constant/FireDataType.java
index d9f1a20..25d1026 100644
--- a/src/main/java/com/zy/core/netty/constant/FireDataType.java
+++ b/src/main/java/com/zy/core/netty/constant/FireDataType.java
@@ -2,7 +2,7 @@
public enum FireDataType {
- HEARTBEAT(0x30, 0x30, "蹇冭烦淇℃伅"),
+ HEARTBEAT(0x36, 0x39, "蹇冭烦淇℃伅"),
FIRE_ALARM(0x38, 0x30, "鐏"),
diff --git a/src/main/java/com/zy/core/netty/domain/fire/Fire_3030.java b/src/main/java/com/zy/core/netty/domain/fire/Fire_3030.java
index 2cbb610..14d48c6 100644
--- a/src/main/java/com/zy/core/netty/domain/fire/Fire_3030.java
+++ b/src/main/java/com/zy/core/netty/domain/fire/Fire_3030.java
@@ -72,7 +72,7 @@
// System.out.println(byteBuf.refCnt());
this.no = analyze(new byte[]{bytes[3], bytes[4]});
this.loop = analyze(new byte[]{bytes[5], bytes[6]});
- this.partNo = analyze(new byte[]{bytes[7], bytes[8]});
+ this.partNo = analyze(new byte[]{bytes[7], bytes[8]}); //0100201 瀵瑰簲 30 31 0200201 瀵瑰簲 34 35
this.year = analyze(new byte[]{bytes[11], bytes[12]});
this.month = analyze(new byte[]{bytes[13], bytes[14]});
this.day = analyze(new byte[]{bytes[15], bytes[16]});
diff --git a/src/main/java/com/zy/core/netty/handle/PackageServerHandler.java b/src/main/java/com/zy/core/netty/handle/PackageServerHandler.java
index bc61d7c..f5caa60 100644
--- a/src/main/java/com/zy/core/netty/handle/PackageServerHandler.java
+++ b/src/main/java/com/zy/core/netty/handle/PackageServerHandler.java
@@ -47,7 +47,8 @@
break;
case FIRE_ALARM:
//娑堥槻IO鐐圭紪鍙�
- String fireNo = fire3030.getNo().toString() + fire3030.getLoop().toString() + fire3030.getPartNo().toString();
+// String fireNo = fire3030.getNo().toString() + fire3030.getLoop().toString() + fire3030.getPartNo().toString();
+ String fireNo =fire3030.getPartNo().toString(); //0100201 瀵瑰簲 30 31 0200201 瀵瑰簲 34 35
String fireTime = "20" + fire3030.getYear() + "-" + fire3030.getMonth() + "-" + fire3030.getDay()
+ " " + fire3030.getHour() + ":" + fire3030.getMinute() + ":" + fire3030.getSeconds();
Date dt = DateUtils.convert(fireTime);
--
Gitblit v1.9.1