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 | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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 bc61d7c..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瀛楁
--
Gitblit v1.9.1