Merge remote-tracking branch 'origin/master'

jinpengyong

2020-11-23 8bb914874ef1ebcda2a9c606224bf3e3db2f46f8

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

@@ -306,9 +306,6 @@
            XxlJobLogger.log("RabbitMQHourlyData:" + hourlyDataList.size());
            if (!CollectionUtils.isEmpty(hourlyDataList)) {
                if(!(hourlyDataList.size()==macList.size())){
                    System.out.println(hourlyDataList.size()+"  "+macList.size());
                    System.out.println(hourlyDataList);
                    System.out.println(macList);
                    List<String> macList_copy = macList;
                    if (hourlyDataList.size()<macList.size()){
                        for (Map hourData: hourlyDataList) {
@@ -319,13 +316,23 @@
                            }
                        }
                    }
                    List<Map<String, Object>> deviceList = deviceService.getAllByMacList(macList_copy);
                    System.out.println(deviceList);
                    List<String> de = new ArrayList<>();
                    for (Map deviceMap:deviceList) {
                        de.add(deviceMap.get("name").toString());
                    List<String> ignoreMacList = new ArrayList();
                    ignoreMacList.add("p5dnd7a0392130");
                    for (String ignoreMac:ignoreMacList) {
                        for (int d=0;d<macList_copy.size();d++){
                            if (macList_copy.get(d).equals(ignoreMac)){
                                macList_copy.remove(d);
                            }
                        }
                    }
                    AlarmUtils_2.sendMail("276999030@qq.com,245285408@qq.com","离线警报",de.toString()+"设备或许离线！");
                    if (macList_copy.size()!=0){
                        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,1vv_zkk6ji3kln@dingtalk.com,liumiao_love@126.com","离线警报",de.toString()+"设备或许离线！");
                    }
                }
                for (Map<String, Object> deviceData : hourlyDataList) {
                    if (!ObjectUtils.isEmpty(deviceData)) {