From 48bd10b213992dd416620e338cf732ee972110de Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 22 Sep 2023 15:44:12 +0800
Subject: [PATCH] chore:测试提交
---
screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 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 bc272cd..3d3378d 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,6 +1,6 @@
-/*
package com.moral.api.kafka.consumer;
+import com.alibaba.fastjson.JSONObject;
import com.moral.api.service.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.kafka.clients.consumer.ConsumerRecord;
@@ -11,6 +11,9 @@
import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -19,10 +22,7 @@
import com.moral.constant.KafkaConstants;
import com.moral.constant.RedisConstants;
-*/
-/*
- * ���������������������
- * *//*
+
@Component
@Slf4j
@@ -102,6 +102,25 @@
//������������
// data.remove("time");
data.remove("entryTime");
+ Map<String, Object> deviceByMac = deviceService.getDeviceByMac(mac.toString());
+ HashMap<String, Object> map = (HashMap<String, Object>) deviceByMac.get("organization");
+ String id = map.get("id").toString();
+ if (id.equals("71")){
+ log.warn(id, msg);
+ ack.acknowledge();
+ return;
+ }
+// SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+// String format = dateFormat.format(new Date().getTime());
+// //������������
+// String substring = format.substring(0, 4);
+//
+// String substring1 = time.toString().substring(0, 4);
+//
+// String replace = time.toString().replace(substring1, substring);
+//
+// data.put("DataTime",replace);
+
Iterator<Map.Entry<String, Object>> iterator = data.entrySet().iterator();
Map<String, Object> newMap = new HashMap<>();
Map.Entry<String, Object> next;
@@ -126,7 +145,7 @@
//������������������������������������������������������
@KafkaListener(topics = KafkaConstants.TOPIC_SECOND, containerFactory = "stateListenerContainerFactory")
- public void listenSecond(ConsumerRecord<String, String> record) {
+ public void listenSecond(ConsumerRecord<String, String> record, Acknowledgment ack) {
String msg = record.value();
try {
Map<String, Object> data = JSON.parseObject(msg, Map.class);
@@ -148,6 +167,7 @@
//���������������������������
data.put("mac", mac);
deviceService.judgeDeviceState(data);
+ ack.acknowledge();
} catch (Exception e) {
log.error("param{}" + msg);
}
@@ -203,4 +223,3 @@
}
}
}
-*/
--
Gitblit v1.8.0