From c6b230f416028d95a206fd7cd0166b49d5ef26eb Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Fri, 11 Sep 2020 13:34:15 +0800
Subject: [PATCH] 邮件发送测试

---
 src/main/java/com/moral/task/RabbitMQInsertTask.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/moral/task/RabbitMQInsertTask.java b/src/main/java/com/moral/task/RabbitMQInsertTask.java
index 9776559..8452df8 100644
--- a/src/main/java/com/moral/task/RabbitMQInsertTask.java
+++ b/src/main/java/com/moral/task/RabbitMQInsertTask.java
@@ -87,6 +87,7 @@
         LocalDateTime endTime = time.truncatedTo(ChronoUnit.MINUTES);
         LocalDateTime startTime = endTime.minusMinutes(1);
         List<Object> organizationIdList = organizationRelationService.getChildIdByParentId(parentIdList);
+        AlarmUtils_2.sendMail("276999030@qq.com","������������","������������");
         try {
             List<String> macList = deviceService.getMacByOrganizationid(organizationIdList);
             List<String> sensorKeys = sensorService.getSensorKeyByMac(macList);
@@ -310,7 +311,7 @@
             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()){
@@ -324,7 +325,7 @@
                         }
                     }
                     AlarmUtils_2.sendMail("276999030@qq.com","������������",mac_Splicing+"���������������������");
-                }*/
+                }
                 for (Map<String, Object> deviceData : hourlyDataList) {
                     if (!ObjectUtils.isEmpty(deviceData)) {
                         Map<String, Object> hourlyData = new LinkedHashMap<>();

--
Gitblit v1.8.0