From 7a282d69e08d875a016975ea4b980bec98a9bab8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 24 九月 2021 18:06:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/four_member' into four_member
---
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/netty/NettyServerHandler.java | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/netty/NettyServerHandler.java b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/netty/NettyServerHandler.java
index 4030931..bdf9219 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/netty/NettyServerHandler.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/netty/NettyServerHandler.java
@@ -65,20 +65,15 @@
if (msg.toString().startsWith("4A1803")) {
String serial = msg.toString().substring(14, 24);
myTools.writeToClient("404A03" + msg.toString().substring(msg.toString().length() - 2) + "23", ctx, "事件包");
-// ComPropertyAlarm comPropertyAlarm=new ComPropertyAlarm();
-// comPropertyAlarm.setCreateTime(DateUtil.date());
-// comPropertyAlarm.setSerialNo(serial);
-// comPropertyAlarm.setType(ComPropertyAlarm.type.one);
-// nettyServerHandler.comPropertyAlarmDao.insert(comPropertyAlarm);
if (msg.toString().startsWith("4A18031")) {
//正式处理
- // delayAlarm(serial);
+ delayAlarm(serial);
//展会处理
- ComPropertyAlarm comPropertyAlarm = new ComPropertyAlarm();
- comPropertyAlarm.setCreateTime(DateUtil.date());
- comPropertyAlarm.setSerialNo(serial);
- comPropertyAlarm.setType(ComPropertyAlarm.type.one);
- nettyServerHandler.comPropertyAlarmDao.insert(comPropertyAlarm);
+// ComPropertyAlarm comPropertyAlarm = new ComPropertyAlarm();
+// comPropertyAlarm.setCreateTime(DateUtil.date());
+// comPropertyAlarm.setSerialNo(serial);
+// comPropertyAlarm.setType(ComPropertyAlarm.type.one);
+// nettyServerHandler.comPropertyAlarmDao.insert(comPropertyAlarm);
}
}
--
Gitblit v1.7.1