From 0eaefd62a7caa039a4f16e27be279eac5e84da5c Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Mon, 16 Oct 2023 08:50:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java | 52 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 32 insertions(+), 20 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 1f80531..528ac65 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,32 +1,30 @@
+/*
package com.moral.api.kafka.consumer;
+import com.alibaba.fastjson.JSON;
import com.moral.api.service.*;
+import com.moral.constant.KafkaConstants;
+import com.moral.constant.RedisConstants;
import lombok.extern.slf4j.Slf4j;
+import org.apache.kafka.clients.consumer.CommitFailedException;
import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.kafka.annotation.KafkaListener;
import org.springframework.kafka.support.Acknowledgment;
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;
-
-import com.alibaba.fastjson.JSON;
-import com.moral.constant.KafkaConstants;
-import com.moral.constant.RedisConstants;
-
+import java.util.*;
@Component
@Slf4j
public class DeviceConsumer {
+ @Value("${result.device.list}")
+ private String deviceList;
@Autowired
private HistoryMinutelyService historyMinutelyService;
@@ -101,6 +99,14 @@
//������������
// 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());
// //������������
@@ -139,6 +145,7 @@
public void listenSecond(ConsumerRecord<String, String> record, Acknowledgment ack) {
String msg = record.value();
try {
+ ack.acknowledge();
Map<String, Object> data = JSON.parseObject(msg, Map.class);
Object mac = data.get("mac");
Object time = data.get("DataTime");
@@ -149,18 +156,22 @@
//������������
data.remove("time");
data.remove("entryTime");
-
- //������������
- data = deviceService.adjustDeviceData(data,"0");
- //������redis
data.put("DataTime", time);
- redisTemplate.opsForHash().put(RedisConstants.DATA_SECOND, mac, data);
- //���������������������������
- data.put("mac", mac);
- deviceService.judgeDeviceState(data);
- ack.acknowledge();
+ List<String> listDictDevice = Arrays.asList(deviceList.split(","));
+ if(listDictDevice.contains(mac.toString())){
+ //���������������������������
+ data.put("mac", mac);
+ deviceService.judgeDeviceState(data);
+ }
+ //������������
+ //data = deviceService.adjustDeviceData(data,"0");
+ //������redis
+ //redisTemplate.opsForHash().put(RedisConstants.DATA_SECOND, mac, data);
+ }catch (CommitFailedException e){
+ log.error("param{}" + msg);
} catch (Exception e) {
log.error("param{}" + msg);
+ ack.acknowledge();
}
}
@@ -214,3 +225,4 @@
}
}
}
+*/
--
Gitblit v1.8.0