小时数据警报删除

lizijie

2020-09-10 9e95a732c62d7ebef9c8c48940ca12552a19b11d

小时数据警报删除

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

@@ -12,7 +12,6 @@

import javax.annotation.Resource;

import com.moral.util.AlarmUtils_2;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.amqp.core.TopicExchange;
@@ -309,21 +308,6 @@
            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;
                    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<>();