From ee138e53a109cfc28aa8565575a944086711094c Mon Sep 17 00:00:00 2001
From: chen_xi <276999030@qq.com>
Date: Thu, 29 Jun 2023 17:33:55 +0800
Subject: [PATCH] 去除无效内容

---
 screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 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 e4ecbac..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);
@@ -196,7 +196,7 @@
             historySecondCruiserService.insertHistorySecond(data);
             ack.acknowledge();
         } catch (Exception e) {
-            log.error("param{}" + msg);
+            log.error("param{}" + e);
         }
     }
 }

--
Gitblit v1.8.0