From 19b72fbd2e6b30a23a06dd284619784a096bc896 Mon Sep 17 00:00:00 2001 From: kaiyu <404897439@qq.com> Date: Thu, 26 Aug 2021 11:33:56 +0800 Subject: [PATCH] screen-manage 单位转换插入添加日志功能 修复organization插入Bug --- screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java b/screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java index c573c6a..aa5bcc7 100644 --- a/screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java +++ b/screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java @@ -37,7 +37,7 @@ public void listen(ConsumerRecord<String, String> record, Consumer consumer) throws Exception { String messageStr = record.value(); Map<String, Object> message = (Map<String, Object>) JSON.parse(messageStr); - long serverStartTime = System.currentTimeMillis(); + //long serverStartTime = System.currentTimeMillis(); CopyOnWriteArraySet<SingleDeviceServer> sockets = SingleDeviceServer.sockets; for (SingleDeviceServer socket : sockets) { //���������������������������socket @@ -46,8 +46,7 @@ if (!mac.equalsIgnoreCase(messageMac)) continue; //������������������ - Map<String, Device> devicesInfo = socket.getDevicesInfo(); - Device device = devicesInfo.get(mac); + Device device = socket.getDeviceAlarmInfo(); //������������������������ Map<String, Object> resultMessgae = new HashMap<>(); //������������ -- Gitblit v1.8.0