lizijie
2020-09-11 da66d9bec5bf2cc069a071f6f7db9e66ba295670
邮件发送
5 files modified
42 ■■■■ changed files
src/main/java/com/moral/mapper/DeviceMapper.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/com/moral/service/DeviceService.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/com/moral/service/impl/DeviceServiceImpl.java 5 ●●●●● patch | view | raw | blame | history
src/main/java/com/moral/task/RabbitMQInsertTask.java 27 ●●●●● patch | view | raw | blame | history
src/main/resources/mapper/DeviceMapper.xml 6 ●●●●● patch | view | raw | blame | history
src/main/java/com/moral/mapper/DeviceMapper.java
@@ -38,4 +38,6 @@
    List<String> getMacsByMonitorPointIds(List<Integer> list);
    List<Map<String, Object>> getAllByMacList(List<String> list);
}
src/main/java/com/moral/service/DeviceService.java
@@ -18,4 +18,6 @@
    List<String> getMacByOrganizationid(List<Object> organizationIdList);
    List<Map<String, Object>> macAndOrganizationIdMap(List<String> macs);
    List<Map<String, Object>> getAllByMacList(List<String> macList);
}
src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -56,4 +56,9 @@
    public List<Map<String, Object>> macAndOrganizationIdMap(List<String> macs) {
        return deviceMapper.macAndOrganizationIdMap(macs);
    }
    @Override
    public List<Map<String, Object>> getAllByMacList(List<String> macList) {
        return deviceMapper.getAllByMacList(macList);
    }
}
src/main/java/com/moral/task/RabbitMQInsertTask.java
@@ -3,11 +3,7 @@
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;
@@ -310,19 +306,26 @@
            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;
                    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;
                            for (int k=0;k<macList_copy.size();k++){
                                if (hourData.get("mac").equals(macList_copy.get(k))){
                                    macList_copy.remove(k);
                                }
                            }
                            i++;
                        }
                    }
                    AlarmUtils_2.sendMail("276999030@qq.com","离线警报",mac_Splicing+"设备或许离线!");
                    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());
                    }
                    AlarmUtils_2.sendMail("276999030@qq.com,245285408@qq.com","离线警报",de.toString()+"设备或许离线!");
                }
                for (Map<String, Object> deviceData : hourlyDataList) {
                    if (!ObjectUtils.isEmpty(deviceData)) {
src/main/resources/mapper/DeviceMapper.xml
@@ -295,4 +295,10 @@
        <foreach item="item" collection="list" index="index" open="(" separator="," close=")">#{item}</foreach>
        and is_delete=0;
    </select>
    <select id="getAllByMacList" resultType="java.util.Map">
        select * from device
        where mac in
        <foreach item="item" collection="list" index="index" open="(" separator="," close=")">#{item}</foreach>
    </select>
</mapper>