From 07a0a0b4506b365b44d4cdbf3ced3c5f678ec8d6 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 20 Apr 2023 08:28:28 +0800
Subject: [PATCH] 处理设备分钟时间延迟问题

---
 screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java b/screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java
index 4c0f4a6..d835587 100644
--- a/screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java
+++ b/screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java
@@ -58,7 +58,7 @@
             }
 
             //������������
-            data.remove("time");
+//            data.remove("time");
             data.remove("entryTime");
             Iterator<Map.Entry<String, Object>> iterator = data.entrySet().iterator();
             Map<String, Object> newMap = new HashMap<>();
@@ -97,7 +97,7 @@
             }
 
             //������������
-            data.remove("time");
+//            data.remove("time");
             data.remove("entryTime");
             Iterator<Map.Entry<String, Object>> iterator = data.entrySet().iterator();
             Map<String, Object> newMap = new HashMap<>();
@@ -138,7 +138,7 @@
             data.remove("entryTime");
 
             //������������
-            data = deviceService.adjustDeviceData(data);
+            data = deviceService.adjustDeviceData(data,"0");
             //������redis
             data.put("DataTime", time);
             redisTemplate.opsForHash().put(RedisConstants.DATA_SECOND, mac, data);

--
Gitblit v1.8.0