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 | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 60 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/task/RabbitMQInsertTask.java b/src/main/java/com/moral/task/RabbitMQInsertTask.java
index 55b2739..8452df8 100644
--- a/src/main/java/com/moral/task/RabbitMQInsertTask.java
+++ b/src/main/java/com/moral/task/RabbitMQInsertTask.java
@@ -12,6 +12,7 @@
import javax.annotation.Resource;
+import com.moral.util.AlarmUtils_2;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.amqp.core.TopicExchange;
@@ -66,6 +67,19 @@
LocalDateTime time = LocalDateTime.now();
int year = time.getYear();
int month = time.getMonthValue();
+ int day = time.getDayOfMonth();
+ int hour = time.getHour();
+ int minute = time.getMinute();
+ if (day == 1) {
+ if (hour == 0 && minute == 0) {
+ if (month == 1) {
+ month = 12;
+ year = year - 1;
+ } else {
+ month = month - 1;
+ }
+ }
+ }
String monthStr = month < 10 ? ("0" + month) : month + "";
String yearAndMonth = year + monthStr;
Map organizationIdMap = JSON.parseObject(params);
@@ -73,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);
@@ -127,6 +142,19 @@
LocalDateTime time = LocalDateTime.now();
int year = time.getYear();
int month = time.getMonthValue();
+ int day = time.getDayOfMonth();
+ int hour = time.getHour();
+ int minute = time.getMinute();
+ if (day == 1) {
+ if (hour == 0 && minute == 0) {
+ if (month == 1) {
+ month = 12;
+ year = year - 1;
+ } else {
+ month = month - 1;
+ }
+ }
+ }
String monthStr = month < 10 ? ("0" + month) : month + "";
String yearAndMonth = year + monthStr;
Map organizationIdMap = JSON.parseObject(params);
@@ -188,6 +216,19 @@
LocalDateTime time = LocalDateTime.now();
int year = time.getYear();
int month = time.getMonthValue();
+ int day = time.getDayOfMonth();
+ int hour = time.getHour();
+ int minute = time.getMinute();
+ if (day == 1) {
+ if (hour == 0 && minute == 0) {
+ if (month == 1) {
+ month = 12;
+ year = year - 1;
+ } else {
+ month = month - 1;
+ }
+ }
+ }
String monthStr = month < 10 ? ("0" + month) : month + "";
String yearAndMonth = year + monthStr;
Map organizationIdMap = JSON.parseObject(params);
@@ -268,7 +309,23 @@
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())){
+ 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;
+ }
+ i++;
+ }
+ }
+ AlarmUtils_2.sendMail("276999030@qq.com","������������",mac_Splicing+"���������������������");
+ }
for (Map<String, Object> deviceData : hourlyDataList) {
if (!ObjectUtils.isEmpty(deviceData)) {
Map<String, Object> hourlyData = new LinkedHashMap<>();
@@ -358,4 +415,7 @@
ReturnT returnT = new ReturnT(500, "RabbitMQ���������������������");
return returnT;
}
+
}
+
+
--
Gitblit v1.8.0