From 9f965bfa801be97c4683ae53bcb4ce897228fd14 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 07 Jul 2023 15:24:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into cjl
---
screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 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 7196145..bc272cd 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
@@ -1,3 +1,4 @@
+/*
package com.moral.api.kafka.consumer;
import com.moral.api.service.*;
@@ -18,9 +19,11 @@
import com.moral.constant.KafkaConstants;
import com.moral.constant.RedisConstants;
+*/
/*
* ���������������������
- * */
+ * *//*
+
@Component
@Slf4j
public class DeviceConsumer {
@@ -36,9 +39,6 @@
@Autowired
private RedisTemplate redisTemplate;
-
- @Autowired
- private HistorySecondSpecialService historySecondSpecialService;
@Autowired
private HistorySecondCruiserService historySecondCruiserService;
@@ -61,7 +61,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<>();
@@ -100,7 +100,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<>();
@@ -141,7 +141,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);
@@ -179,7 +179,7 @@
}
//������������������
- @KafkaListener(topics = KafkaConstants.CRUISER_TOPIC_SECOND, groupId = KafkaConstants.GROUP_INSERT, containerFactory = "insertListenerContainerFactory")
+ @KafkaListener(topics = KafkaConstants.CRUISER_TOPIC_SECOND, containerFactory = "insertListenerContainerFactory")
public void listenSecondCruiser(ConsumerRecord<String, String> record, Acknowledgment ack) {
String msg = record.value();
try {
@@ -199,7 +199,8 @@
historySecondCruiserService.insertHistorySecond(data);
ack.acknowledge();
} catch (Exception e) {
- log.error("param{}" + msg);
+ log.error("param{}" + e);
}
}
}
+*/
--
Gitblit v1.8.0