删除打印

lizijie

2020-09-11 ee0737924fd917e47ec5468a7f8db5d77791793d

 src/main/java/com/moral/task/RabbitMQInsertTask.java

@@ -3,15 +3,12 @@
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;

import com.moral.util.AlarmUtils_2;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.amqp.core.TopicExchange;
@@ -308,6 +305,24 @@
            List<Map<String, Object>> hourlyDataList = historyHourlyService.getHourlySensorData(devices);
            XxlJobLogger.log("RabbitMQHourlyData:" + hourlyDataList.size());
            if (!CollectionUtils.isEmpty(hourlyDataList)) {
                if(!(hourlyDataList.size()==macList.size())){
                    List<String> macList_copy = macList;
                    if (hourlyDataList.size()<macList.size()){
                        for (Map hourData: hourlyDataList) {
                            for (int k=0;k<macList_copy.size();k++){
                                if (hourData.get("mac").equals(macList_copy.get(k))){
                                    macList_copy.remove(k);
                                }
                            }
                        }
                    }
                    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)) {
                        Map<String, Object> hourlyData = new LinkedHashMap<>();