From d312d25e147e1e90c3600de4653ffbdcf7df76f3 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Wed, 04 Nov 2020 08:56:13 +0800
Subject: [PATCH] device_adjust_value表更新
---
src/main/java/com/moral/task/RabbitMQInsertTask.java | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/moral/task/RabbitMQInsertTask.java b/src/main/java/com/moral/task/RabbitMQInsertTask.java
index 9776559..6ee61ff 100644
--- a/src/main/java/com/moral/task/RabbitMQInsertTask.java
+++ b/src/main/java/com/moral/task/RabbitMQInsertTask.java
@@ -3,11 +3,7 @@
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
import javax.annotation.Resource;
@@ -308,23 +304,36 @@
devices.put("macs", macList);
List<Map<String, Object>> hourlyDataList = historyHourlyService.getHourlySensorData(devices);
XxlJobLogger.log("RabbitMQHourlyData:" + hourlyDataList.size());
- AlarmUtils_2.sendMail("357328213@qq.com","������������","������������");
if (!CollectionUtils.isEmpty(hourlyDataList)) {
- /*if(!(hourlyDataList.size()==macList.size())){
+ if(!(hourlyDataList.size()==macList.size())){
List<String> macList_copy = macList;
- String mac_Splicing = null;
if (hourlyDataList.size()<macList.size()){
- int i = 0;
for (Map hourData: hourlyDataList) {
- if (!hourData.get("mac").toString().equals(macList_copy.get(i))){
- mac_Splicing = mac_Splicing+hourData.get("mac")+",";
- i=i-1;
+ for (int k=0;k<macList_copy.size();k++){
+ if (hourData.get("mac").equals(macList_copy.get(k))){
+ macList_copy.remove(k);
+ }
}
- i++;
}
}
- AlarmUtils_2.sendMail("276999030@qq.com","������������",mac_Splicing+"���������������������");
- }*/
+ 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);
+ }
+ }
+ }
+ 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)) {
Map<String, Object> hourlyData = new LinkedHashMap<>();
--
Gitblit v1.8.0