From 0956cd2d3f2840f2f26855f05a83165d63dd7ba1 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 28 十一月 2022 15:34:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/netty/handle/PackageServerHandler.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
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 de37841..8db7df1 100644
--- a/src/main/java/com/zy/core/netty/handle/PackageServerHandler.java
+++ b/src/main/java/com/zy/core/netty/handle/PackageServerHandler.java
@@ -44,10 +44,18 @@
case HEARTBEAT:
ChannelCache.setChannel(String.valueOf(fire3030.getNo()), ctx.channel());
Constant.errorMap.remove(fire3030.getNo());
+ LocMastService locMastService2 = SpringUtils.getBean(LocMastService.class);
+ LocMast locMast2 = locMastService2.selectOne(new EntityWrapper<LocMast>().eq("loc_no","0101804"));
+ if(null != locMast2) {
+ locMast2.setChannel(10000);
+ locMast2.setModiTime(new Date());
+ locMastService2.update(locMast2, new EntityWrapper<LocMast>().eq("loc_no", "0101804"));
+ }
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);
@@ -116,8 +124,12 @@
dataBytes[6] = rfidBytes[13];
dataBytes[7] = rfidBytes[14];
String str = new String(dataBytes);
+ String barcode = new String(rfidBytes,7,8);
System.out.println(str);
}
+
+ String aa= "ILY0127 0001";
+ byte[] byteAa = aa.getBytes();
byte[] bytes = new byte[]{(byte)0x82, 0x38, 0x30, 0x32, 0x34, 0x30, 0x38, 0x39, 0x3B, 0x30, 0x31, 0x31, 0x31,
0x30, 0x33, 0x30, 0x38, 0x31, 0x30, 0x30, 0x34, 0x30, 0x38, 0x38, 0x30, (byte)0x83};
@@ -127,6 +139,5 @@
//娑堥槻IO鐐圭紪鍙�
String fireNo = fire3030.getNo().toString() + fire3030.getLoop().toString() + fire3030.getPartNo().toString();
System.out.println(fireNo);
- String aa="";
}
}
--
Gitblit v1.9.1