From 82f7ab08b5316fceae0b092ec57cde7bd8bb143c Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Tue, 22 Sep 2020 13:32:08 +0800
Subject: [PATCH] 走航车数据插入update
---
src/main/java/com/moral/task/RabbitMQInsertTask.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moral/task/RabbitMQInsertTask.java b/src/main/java/com/moral/task/RabbitMQInsertTask.java
index 115de9d..b5e946e 100644
--- a/src/main/java/com/moral/task/RabbitMQInsertTask.java
+++ b/src/main/java/com/moral/task/RabbitMQInsertTask.java
@@ -316,12 +316,23 @@
}
}
}
- List<Map<String, Object>> deviceList = deviceService.getAllByMacList(macList_copy);
- 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,245285408@qq.com","������������",de.toString()+"���������������������");
+ }
}
for (Map<String, Object> deviceData : hourlyDataList) {
if (!ObjectUtils.isEmpty(deviceData)) {
--
Gitblit v1.8.0