From f46a8c26ec22377ecb4d777b0a72b6cac48cb879 Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期四, 18 八月 2022 09:40:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/netty/handle/PackageServerHandler.java | 49 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 45 insertions(+), 4 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 b7d89c3..de37841 100644
--- a/src/main/java/com/zy/core/netty/handle/PackageServerHandler.java
+++ b/src/main/java/com/zy/core/netty/handle/PackageServerHandler.java
@@ -1,10 +1,14 @@
package com.zy.core.netty.handle;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.DateUtils;
import com.core.common.SpringUtils;
+import com.zy.asrs.entity.FireLog;
import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.service.FireLogService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.impl.MainServiceImpl;
+import com.zy.asrs.utils.Utils;
import com.zy.core.netty.AbstractInboundHandler;
import com.zy.core.netty.cache.ChannelCache;
import com.zy.core.netty.constant.Constant;
@@ -46,14 +50,35 @@
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);
LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
if(null != locMastService){
+ //鎶ヨ淇″彿鏇存柊鍒板簱瀛樹富妗� fire_status瀛楁
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("fire_no",fireNo));
if(null != locMast){
- locMast.setFireStatus(1);
- locMast.setModiTime(new Date());
- locMastService.update(locMast, new EntityWrapper<LocMast>().eq("fire_no",fireNo));
+ if(locMast.getFireStatus() != 1) {
+ locMast.setFireStatus(1);
+ locMast.setModiTime(new Date());
+ locMastService.update(locMast, new EntityWrapper<LocMast>().eq("fire_no", fireNo));
+ }
+
+ //鎻掑叆鎶ヨ鏃ュ織璁板綍锛屽悓涓�搴撲綅鍚屼竴鎶ヨ鍙彃鍏ヤ竴娆�
+ FireLogService fireLogService = SpringUtils.getBean(FireLogService.class);
+ if(null != fireLogService){
+ String ymd = "20" + fire3030.getYear() + "" + fire3030.getMonth() + "" + fire3030.getDay();
+ FireLog one = fireLogService.selectOne(new EntityWrapper<FireLog>()
+ .eq("ymd",ymd)
+ .eq("fire_no",fireNo));
+ if(null == one) {
+ FireLog fireLog = new FireLog();
+ fireLog.setYmd(ymd);
+ fireLog.setFireNo(fireNo);
+ fireLog.setFireTime(dt);
+ fireLog.setLocNo(locMast.getLocNo());
+ fireLog.setCreateTime(new Date());
+ fireLogService.insert(fireLog);
+ }
+ }
}
}
break;
@@ -78,6 +103,22 @@
/**************************************** 娴嬭瘯涓撶敤 *****************************************/
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);
+ System.out.println(str);
+ }
+
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);
--
Gitblit v1.9.1