From b143fe586d7be6c12ec162bf5aebb3a99bff7e32 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 06 九月 2023 08:48:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zjfnwcs' into zjfnwcs
---
src/main/java/com/zy/core/netty/handle/PackageServerHandler.java | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 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 5487114..faa5fdd 100644
--- a/src/main/java/com/zy/core/netty/handle/PackageServerHandler.java
+++ b/src/main/java/com/zy/core/netty/handle/PackageServerHandler.java
@@ -35,7 +35,7 @@
@Autowired
private MainServiceImpl mainService;
-
+ //娑堥槻蹇冭烦锛岀伀璀�
@Override
protected boolean channelRead0(ChannelHandlerContext ctx, ChPackage pac) {
FireDataType dataType = FireDataType.get(pac.getBytes()[1], pac.getBytes()[2]);
@@ -44,13 +44,17 @@
case HEARTBEAT:
ChannelCache.setChannel(String.valueOf(fire3030.getNo()), ctx.channel());
Constant.errorMap.remove(fire3030.getNo());
+ LocMastService locMastService2 = SpringUtils.getBean(LocMastService.class);
break;
case FIRE_ALARM:
//娑堥槻IO鐐圭紪鍙�
- String fireNo = fire3030.getNo().toString() + fire3030.getLoop().toString() + fire3030.getPartNo().toString();
- String fireTime = "20" + fire3030.getYear() + "-" + fire3030.getMonth() + "-" + fire3030.getDay()
- + " " + fire3030.getHour() + ":" + fire3030.getMinute() + ":" + fire3030.getSeconds();
- Date dt = DateUtils.convert(fireTime);
+// String fireNo = fire3030.getNo().toString() + fire3030.getLoop().toString() + fire3030.getPartNo().toString();
+ String fireNo =fire3030.getPartNo().toString(); //0100201 瀵瑰簲 30 31 0200201 瀵瑰簲 34 35
+ int count=Integer.valueOf(fireNo)/2+Integer.valueOf(fireNo)%2;
+ fireNo=""+count;
+// String fireTime = "20" + fire3030.getYear() + "-" + fire3030.getMonth() + "-" + fire3030.getDay()
+// + " " + fire3030.getHour() + ":" + fire3030.getMinute() + ":" + fire3030.getSeconds();
+ Date dt = new Date();
LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
if(null != locMastService){
//鎶ヨ淇″彿鏇存柊鍒板簱瀛樹富妗� fire_status瀛楁
@@ -103,6 +107,26 @@
/**************************************** 娴嬭瘯涓撶敤 *****************************************/
public static void main(String[] args){
+ byte[] rfidBytes = new byte[]{(byte)0xA0, 0x13, 0x01, (byte)0x8A, (byte)0xB6, 0x30, 0x00,
+ 0x38, 0x30, 0x33, 0x34, 0x35, 0x36, 0x37, (byte)0x38, 0x28, (byte)0xC3, (byte)0x81, 0x2D, (byte)0xB0, 0x2F };
+ if(rfidBytes.length > 15) {
+ byte[] dataBytes = new byte[8];
+ dataBytes[0] = rfidBytes[7];
+ dataBytes[1] = rfidBytes[8];
+ dataBytes[2] = rfidBytes[9];
+ dataBytes[3] = rfidBytes[10];
+ dataBytes[4] = rfidBytes[11];
+ dataBytes[5] = rfidBytes[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};
Fire_3030 fire3030 = new Fire_3030().readFromBytes(bytes);
@@ -111,6 +135,5 @@
//娑堥槻IO鐐圭紪鍙�
String fireNo = fire3030.getNo().toString() + fire3030.getLoop().toString() + fire3030.getPartNo().toString();
System.out.println(fireNo);
- String aa="";
}
}
--
Gitblit v1.9.1