lizijie
2020-09-11 c6b230f416028d95a206fd7cd0166b49d5ef26eb
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<>();