From f99abcd94998485854ca18f149fecc33c24bf5de Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Fri, 20 Nov 2020 14:10:25 +0800
Subject: [PATCH] 校准值插入redis
---
src/main/java/com/moral/task/RabbitMQInsertTask.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/moral/task/RabbitMQInsertTask.java b/src/main/java/com/moral/task/RabbitMQInsertTask.java
index e34b589..6ee61ff 100644
--- a/src/main/java/com/moral/task/RabbitMQInsertTask.java
+++ b/src/main/java/com/moral/task/RabbitMQInsertTask.java
@@ -306,9 +306,6 @@
XxlJobLogger.log("RabbitMQHourlyData:" + hourlyDataList.size());
if (!CollectionUtils.isEmpty(hourlyDataList)) {
if(!(hourlyDataList.size()==macList.size())){
- System.out.println(hourlyDataList.size()+" "+macList.size());
- System.out.println(hourlyDataList);
- System.out.println(macList);
List<String> macList_copy = macList;
if (hourlyDataList.size()<macList.size()){
for (Map hourData: hourlyDataList) {
@@ -319,13 +316,23 @@
}
}
}
- List<Map<String, Object>> deviceList = deviceService.getAllByMacList(macList_copy);
- System.out.println(deviceList);
- List<String> de = new ArrayList<>();
- for (Map deviceMap:deviceList) {
- de.add(deviceMap.get("name").toString());
+ List<String> ignoreMacList = new ArrayList();
+ ignoreMacList.add("p5dnd7a0392130");
+ for (String ignoreMac:ignoreMacList) {
+ for (int d=0;d<macList_copy.size();d++){
+ if (macList_copy.get(d).equals(ignoreMac)){
+ macList_copy.remove(d);
+ }
+ }
}
- AlarmUtils_2.sendMail("276999030@qq.com,245285408@qq.com","������������",de.toString()+"���������������������");
+ if (macList_copy.size()!=0){
+ List<Map<String, Object>> deviceList = deviceService.getAllByMacList(macList_copy);
+ List<String> de = new ArrayList<>();
+ for (Map deviceMap:deviceList) {
+ de.add(deviceMap.get("name").toString());
+ }
+ AlarmUtils_2.sendMail("276999030@qq.com,1vv_zkk6ji3kln@dingtalk.com,liumiao_love@126.com","������������",de.toString()+"���������������������");
+ }
}
for (Map<String, Object> deviceData : hourlyDataList) {
if (!ObjectUtils.isEmpty(deviceData)) {
--
Gitblit v1.8.0