From da66d9bec5bf2cc069a071f6f7db9e66ba295670 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Fri, 11 Sep 2020 17:29:53 +0800
Subject: [PATCH] 邮件发送
---
src/main/java/com/moral/service/DeviceService.java | 2 ++
src/main/resources/mapper/DeviceMapper.xml | 6 ++++++
src/main/java/com/moral/task/RabbitMQInsertTask.java | 27 +++++++++++++++------------
src/main/java/com/moral/mapper/DeviceMapper.java | 2 ++
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 5 +++++
5 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/moral/mapper/DeviceMapper.java b/src/main/java/com/moral/mapper/DeviceMapper.java
index f435dc0..2ade144 100644
--- a/src/main/java/com/moral/mapper/DeviceMapper.java
+++ b/src/main/java/com/moral/mapper/DeviceMapper.java
@@ -38,4 +38,6 @@
List<String> getMacsByMonitorPointIds(List<Integer> list);
+ List<Map<String, Object>> getAllByMacList(List<String> list);
+
}
\ No newline at end of file
diff --git a/src/main/java/com/moral/service/DeviceService.java b/src/main/java/com/moral/service/DeviceService.java
index 0ef2920..786bbb1 100644
--- a/src/main/java/com/moral/service/DeviceService.java
+++ b/src/main/java/com/moral/service/DeviceService.java
@@ -18,4 +18,6 @@
List<String> getMacByOrganizationid(List<Object> organizationIdList);
List<Map<String, Object>> macAndOrganizationIdMap(List<String> macs);
+
+ List<Map<String, Object>> getAllByMacList(List<String> macList);
}
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index 280914b..2d97264 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -56,4 +56,9 @@
public List<Map<String, Object>> macAndOrganizationIdMap(List<String> macs) {
return deviceMapper.macAndOrganizationIdMap(macs);
}
+
+ @Override
+ public List<Map<String, Object>> getAllByMacList(List<String> macList) {
+ return deviceMapper.getAllByMacList(macList);
+ }
}
diff --git a/src/main/java/com/moral/task/RabbitMQInsertTask.java b/src/main/java/com/moral/task/RabbitMQInsertTask.java
index e4b1a20..e34b589 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;
@@ -310,19 +306,26 @@
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;
- 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<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());
+ }
+ AlarmUtils_2.sendMail("276999030@qq.com,245285408@qq.com","������������",de.toString()+"���������������������");
}
for (Map<String, Object> deviceData : hourlyDataList) {
if (!ObjectUtils.isEmpty(deviceData)) {
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index eca27c3..5b8fe34 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -295,4 +295,10 @@
<foreach item="item" collection="list" index="index" open="(" separator="," close=")">#{item}</foreach>
and is_delete=0;
</select>
+
+ <select id="getAllByMacList" resultType="java.util.Map">
+ select * from device
+ where mac in
+ <foreach item="item" collection="list" index="index" open="(" separator="," close=")">#{item}</foreach>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0