From 0d24ea21533d9135c8963a28d8d45bfd207b8ec6 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 01 Jul 2021 14:17:22 +0800
Subject: [PATCH] update
---
screen-manage/src/main/java/com/moral/api/kafka/consumer/KafkaConsumer.java | 50 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 34 insertions(+), 16 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/kafka/consumer/KafkaConsumer.java b/screen-manage/src/main/java/com/moral/api/kafka/consumer/KafkaConsumer.java
index 8b185e0..adc3c81 100644
--- a/screen-manage/src/main/java/com/moral/api/kafka/consumer/KafkaConsumer.java
+++ b/screen-manage/src/main/java/com/moral/api/kafka/consumer/KafkaConsumer.java
@@ -10,8 +10,8 @@
import org.springframework.util.StringUtils;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
-import java.util.stream.Collectors;
import com.alibaba.fastjson.JSON;
import com.moral.api.service.DeviceService;
@@ -52,18 +52,27 @@
}
//������������
- data = data.entrySet().stream()
- .filter(map -> {
- String key = map.getKey();
- return !(key.contains("Min") || key.contains("Max") || key.contains("Cou"));
- }).collect(Collectors.toMap(m -> m.getKey().replaceAll("-Avg", ""), Map.Entry::getValue));
data.remove("time");
data.remove("entryTime");
+ Iterator<Map.Entry<String, Object>> iterator = data.entrySet().iterator();
+ Map<String, Object> newMap = new HashMap<>();
+ Map.Entry<String, Object> next;
+ while (iterator.hasNext()) {
+ next = iterator.next();
+ String key = next.getKey();
+ Object value = next.getValue();
+ if (key.contains("-Avg")) {
+ newMap.put(key.replaceAll("-Avg", ""), value);
+ } else {
+ newMap.put(key, value);
+ }
+ iterator.remove();
+ }
//���������������
- historyMinutelyService.insertHistoryMinutely(data);
+ historyMinutelyService.insertHistoryMinutely(newMap);
ack.acknowledge();
} catch (Exception e) {
- //log.error("param{}" + msg);
+ log.error("param{}" + msg);
}
}
@@ -83,18 +92,27 @@
}
//������������
- data = data.entrySet().stream()
- .filter(map -> {
- String key = map.getKey();
- return !(key.contains("Min") || key.contains("Max") || key.contains("Cou"));
- }).collect(Collectors.toMap(m -> m.getKey().replaceAll("-Avg", ""), Map.Entry::getValue));
data.remove("time");
data.remove("entryTime");
+ Iterator<Map.Entry<String, Object>> iterator = data.entrySet().iterator();
+ Map<String, Object> newMap = new HashMap<>();
+ Map.Entry<String, Object> next;
+ while (iterator.hasNext()) {
+ next = iterator.next();
+ String key = next.getKey();
+ Object value = next.getValue();
+ if (key.contains("-Avg")) {
+ newMap.put(key.replaceAll("-Avg", ""), value);
+ } else {
+ newMap.put(key, value);
+ }
+ iterator.remove();
+ }
//���������������
- historyHourlyService.insertHistoryHourly(data);
+ historyHourlyService.insertHistoryHourly(newMap);
ack.acknowledge();
} catch (Exception e) {
- //log.error("param{}" + msg);
+ log.error("param{}" + msg);
}
}
@@ -120,7 +138,7 @@
deviceService.judgeDeviceState(data);
ack.acknowledge();
} catch (Exception e) {
- //log.error("param{}" + msg);
+ log.error("param{}" + msg);
}
}
}
--
Gitblit v1.8.0