增加最近数据时间为null时业务跳出查询逻辑

6 files changed, 279 insertions, 117 deletions

diff --git a/src/main/java/com/nis/galaxy/web/service/impl/BlockingServiceImp.java b/src/main/java/com/nis/galaxy/web/service/impl/BlockingServiceImp.java
index 3e1877f..b76fd49 100644
--- a/src/main/java/com/nis/galaxy/web/service/impl/BlockingServiceImp.java
+++ b/src/main/java/com/nis/galaxy/web/service/impl/BlockingServiceImp.java
@@ -31,12 +31,22 @@ public class BlockingServiceImp implements BlockingService {
 
     //地域表
     public Map<String, AreaDictInfo> listAreaDictInfo() {
-        return MyLoad.listAreaDictInfo;
+        Map<String, AreaDictInfo> listAreaDictInfo = MyLoad.listAreaDictInfo;
+        if (listAreaDictInfo == null || listAreaDictInfo.size() == 0) {
+            logger.warn("地域表无数据");
+            listAreaDictInfo = new HashMap<>();
+        }
+        return listAreaDictInfo;
     }
 
     //业务表
     public Map<String, NtcServiceDict> listNtcService() {
-        return MyLoad.listNtcService;
+        Map<String, NtcServiceDict> listNtcService = MyLoad.listNtcService;
+        if (listNtcService == null || listNtcService.size() == 0) {
+            logger.warn("业务表无数据");
+            listNtcService = new HashMap<>();
+        }
+        return listNtcService;
     }
 
     /**
@@ -66,12 +76,14 @@ public class BlockingServiceImp implements BlockingService {
             if (ListUtils.isEmptyList(list)) {
                 logger.warn("封堵信息整体显示\tNTC_TOTAL_REPORT\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
                 try {
-                    long timeMillis = System.currentTimeMillis();
                     Date lastTime = blockingDao.getAllBlockInformationLastTime(end);
-                    String time = DateUtils.formatDateTime(lastTime);
-                    time = DateUtils.getRangeOf5min(time);
-                    list = blockingDao.getAllBlockInformation(start, time, DateUtils.getAfter5min(time));
-                    logger.trace("封堵信息整体显示\t最近数据查询耗时\t" + String.valueOf(System.currentTimeMillis() - timeMillis));
+                    if (lastTime != null) {
+                        String time = DateUtils.formatDateTime(lastTime);
+                        time = DateUtils.getRangeOf5min(time);
+                        list = blockingDao.getAllBlockInformation(start, time, DateUtils.getAfter5min(time));
+                    } else {
+                        logger.warn("封堵信息整体显示\tNTC_TOTAL_REPORT\t无数据");
+                    }
                 } catch (Exception e) {
                     logger.error("封堵信息整体显示\t最近数据\t查询异常\tserviceImpl", e);
                 }
@@ -118,9 +130,13 @@ public class BlockingServiceImp implements BlockingService {
                 logger.warn("DNS欺骗信息显示\tNTC_ENTRANCE_REPORT\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
                 try {
                     Date lastTime = blockingDao.getDNSDeceiveInformationLastTime(end);
-                    String time = DateUtils.formatDateTime(lastTime);
-                    time = DateUtils.getRangeOf5min(time);
-                    list = blockingDao.getDNSDeceiveInformationOnly(start, time, DateUtils.getAfter5min(time));
+                    if (lastTime != null) {
+                        String time = DateUtils.formatDateTime(lastTime);
+                        time = DateUtils.getRangeOf5min(time);
+                        list = blockingDao.getDNSDeceiveInformationOnly(start, time, DateUtils.getAfter5min(time));
+                    } else {
+                        logger.warn("DNS欺骗信息显示\tNTC_ENTRANCE_REPORT\t无数据");
+                    }
                 } catch (Exception e) {
                     logger.error("DNS欺骗信息显示\t最近数据\t查询异常\tserviceImpl", e);
                 }
@@ -182,9 +198,13 @@ public class BlockingServiceImp implements BlockingService {
             logger.warn("24小时内全国范围阻断协议信息\tNTC_SERVICE_REPORT\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
             try {
                 Date lastTime = blockingDao.get24hAllBlockEachProtocolOLastTime(end);
-                String time = DateUtils.formatDateTime(lastTime);
-                time = DateUtils.getRangeOf5min(time);
-                list = blockingDao.get24hAllBlockEachProtocolOnly(start, time, DateUtils.getAfter5min(time));
+                if (lastTime != null) {
+                    String time = DateUtils.formatDateTime(lastTime);
+                    time = DateUtils.getRangeOf5min(time);
+                    list = blockingDao.get24hAllBlockEachProtocolOnly(start, time, DateUtils.getAfter5min(time));
+                } else {
+                    logger.warn("24小时内全国范围阻断协议信息\tNTC_SERVICE_REPORT\t无数据");
+                }
             } catch (Exception e) {
                 logger.error("24小时内全国范围阻断协议信息\t最近数据\t查询异常\tserviceImpl", e);
             }
@@ -243,9 +263,13 @@ public class BlockingServiceImp implements BlockingService {
             logger.warn("封堵信息分布显示\tNTC_ENTRANCE_REPORT\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
             try {
                 Date lastTime = blockingDao.getDisBlockInformationLastTime(end);
-                String time = DateUtils.formatDateTime(lastTime);
-                time = DateUtils.getRangeOf5min(time);
-                list = blockingDao.getDisBlockInformationOnly(start, time, DateUtils.getAfter5min(time));
+                if (lastTime != null) {
+                    String time = DateUtils.formatDateTime(lastTime);
+                    time = DateUtils.getRangeOf5min(time);
+                    list = blockingDao.getDisBlockInformationOnly(start, time, DateUtils.getAfter5min(time));
+                } else {
+                    logger.warn("封堵信息分布显示\tNTC_ENTRANCE_REPORT\t无数据");
+                }
             } catch (Exception e) {
                 logger.error("封堵信息分布显示\t最近数据\t查询异常\tserviceImpl", e);
             }
@@ -253,7 +277,7 @@ public class BlockingServiceImp implements BlockingService {
         //迭代映射地域表，过滤无地域映射数据
         if (!ListUtils.isEmptyList(list)) {
             Iterator<NtcDisReport> ntcDisReport = list.iterator();
-            while (ntcDisReport.hasNext()){
+            while (ntcDisReport.hasNext()) {
                 NtcDisReport next = ntcDisReport.next();
                 String area = next.getArea();
                 AreaDictInfo areaDictInfo = listArea.get(area);
@@ -294,9 +318,13 @@ public class BlockingServiceImp implements BlockingService {
             logger.warn("24小时内全国热力图\tNTC_SERVICE_BEHAV_STATISTIC\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
             try {
                 Date lastTime = blockingDao.getAllHotStatistisLastTime(end);
-                String time = DateUtils.formatDateTime(lastTime);
-                time = DateUtils.getRangeOf5min(time);
-                list = blockingDao.getAllHotStatistisOnly(start, time, DateUtils.getAfter5min(time));
+                if (lastTime != null) {
+                    String time = DateUtils.formatDateTime(lastTime);
+                    time = DateUtils.getRangeOf5min(time);
+                    list = blockingDao.getAllHotStatistisOnly(start, time, DateUtils.getAfter5min(time));
+                } else {
+                    logger.warn("24小时内全国热力图\tNTC_SERVICE_BEHAV_STATISTIC\t无数据");
+                }
             } catch (Exception e) {
                 logger.error("24小时内全国热力图\t最近数据\t查询异常\tserviceImpl", e);
             }
@@ -304,7 +332,7 @@ public class BlockingServiceImp implements BlockingService {
         //迭代映射地域表，过滤无地域映射数据
         if (!ListUtils.isEmptyList(list)) {
             Iterator<HotStatistic> hotStatistic = list.iterator();
-            while (hotStatistic.hasNext()){
+            while (hotStatistic.hasNext()) {
                 HotStatistic next = hotStatistic.next();
                 String area = next.getArea();
                 String type = next.getType();
@@ -312,7 +340,7 @@ public class BlockingServiceImp implements BlockingService {
                 AreaDictInfo areaDictInfo = listArea.get(area);
                 if (areaDictInfo != null) {
                     next.setArea(areaDictInfo.getItemValue());
-                }else {
+                } else {
                     hotStatistic.remove();
                     continue;
                 }
@@ -328,7 +356,7 @@ public class BlockingServiceImp implements BlockingService {
                 }
             }
         }
-        logger.info("封堵信息分布显示耗时：" + (System.currentTimeMillis() - timeMillisStart));
+        logger.info("24小时内全国热力图：" + (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
             logger.info("24小时内全国热力图------->测试数据");
             list.add(new HotStatistic(start, "Астана", "103.227.81.43", "10.11.36.42", "IP Address Monitor", (int) (Math.random() * 100)));
@@ -426,9 +454,13 @@ public class BlockingServiceImp implements BlockingService {
             logger.warn("热力图接口\tNTC_ENTRANCE_REPORT\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
             try {
                 Date lastTime = blockingDao.getDisBlockMapLastTime(end);
-                String time = DateUtils.formatDateTime(lastTime);
-                time = DateUtils.getRangeOf5min(time);
-                list = blockingDao.getDisBlockMapOnly(start, time, DateUtils.getAfter5min(time));
+                if (lastTime != null) {
+                    String time = DateUtils.formatDateTime(lastTime);
+                    time = DateUtils.getRangeOf5min(time);
+                    list = blockingDao.getDisBlockMapOnly(start, time, DateUtils.getAfter5min(time));
+                } else {
+                    logger.warn("热力图接口\tNTC_ENTRANCE_REPORT\t无数据");
+                }
             } catch (Exception e) {
                 logger.error("热力图接口\t最近数据\t查询异常\tserviceImpl", e);
             }
diff --git a/src/main/java/com/nis/galaxy/web/service/impl/BlockingTopNServiceImpl.java b/src/main/java/com/nis/galaxy/web/service/impl/BlockingTopNServiceImpl.java
index e40f237..8d13a8c 100644
--- a/src/main/java/com/nis/galaxy/web/service/impl/BlockingTopNServiceImpl.java
+++ b/src/main/java/com/nis/galaxy/web/service/impl/BlockingTopNServiceImpl.java
@@ -27,17 +27,31 @@ public class BlockingTopNServiceImpl implements BlockingTopNService {
 
     //地域表
     public Map<String, AreaDictInfo> listAreaDictInfo() {
-        return MyLoad.listAreaDictInfo;
+        Map<String, AreaDictInfo> listAreaDictInfo = MyLoad.listAreaDictInfo;
+        if (listAreaDictInfo == null || listAreaDictInfo.size() == 0) {
+            logger.warn("地域表无数据");
+            listAreaDictInfo = new HashMap<>();
+        }
+        return listAreaDictInfo;
     }
 
     //标签表
     public Map<String, UiTagDictInfo> listUiTagDicInfo() {
-        return MyLoad.listUiTagDicInfo;
+        Map<String, UiTagDictInfo> listUiTagDicInfo = MyLoad.listUiTagDicInfo;
+        if (listUiTagDicInfo == null || listUiTagDicInfo.size() == 0) {
+            logger.warn("标签表无数据");
+        }
+        return listUiTagDicInfo;
     }
 
     //业务表
     public Map<String, NtcServiceDict> listNtcService() {
-        return MyLoad.listNtcService;
+        Map<String, NtcServiceDict> listNtcService = MyLoad.listNtcService;
+        if (listNtcService == null || listNtcService.size() == 0) {
+            logger.warn("业务表无数据");
+            listNtcService = new HashMap<>();
+        }
+        return listNtcService;
     }
 
     /**
@@ -61,9 +75,13 @@ public class BlockingTopNServiceImpl implements BlockingTopNService {
             logger.warn("1小时内全国阻断URLTOP10\tNTC_REJECT_URL_STATISTIC\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
             try {
                 Date lastTime = blockingTopNDao.getBlockTop10URLOf1hLastTime(end);
-                String time = DateUtils.formatDateTime(lastTime);
-                time = DateUtils.getRangeOfhour(time);
-                list = blockingTopNDao.getBlockTop10URLOf1h(start, time, DateUtils.getAfter1h(time));
+                if (lastTime != null) {
+                    String time = DateUtils.formatDateTime(lastTime);
+                    time = DateUtils.getRangeOfhour(time);
+                    list = blockingTopNDao.getBlockTop10URLOf1h(start, time, DateUtils.getAfter1h(time));
+                } else {
+                    logger.warn("1小时内全国阻断URLTOP10\tNTC_REJECT_URL_STATISTIC\t无数据");
+                }
             } catch (Exception e) {
                 logger.error("1小时内全国阻断URLTOP10\t最近数据\t查询异常\tserviceImpl", e);
             }
@@ -115,9 +133,13 @@ public class BlockingTopNServiceImpl implements BlockingTopNService {
             logger.warn("1小时内全国阻断网站TOP10\tNTC_REJECT_WEBSITE_STATISTIC\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
             try {
                 Date lastTime = blockingTopNDao.getBlockTop10WebsiteOf1hLastTime(end);
-                String time = DateUtils.formatDateTime(lastTime);
-                time = DateUtils.getRangeOfhour(time);
-                list = blockingTopNDao.getBlockTop10WebsiteOf1h(start, time, DateUtils.getAfter1h(time));
+                if (lastTime != null) {
+                    String time = DateUtils.formatDateTime(lastTime);
+                    time = DateUtils.getRangeOfhour(time);
+                    list = blockingTopNDao.getBlockTop10WebsiteOf1h(start, time, DateUtils.getAfter1h(time));
+                } else {
+                    logger.warn("1小时内全国阻断网站TOP10\tNTC_REJECT_WEBSITE_STATISTIC\t无数据");
+                }
             } catch (Exception e) {
                 logger.error("1小时内全国阻断网站TOP10\t最近数据\t查询异常\tserviceImpl", e);
             }
@@ -172,9 +194,13 @@ public class BlockingTopNServiceImpl implements BlockingTopNService {
             logger.warn("24小时内区域阻断协议TOP10\tNTC_ENTRANCE_REPORT\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
             try {
                 Date lastTime = blockingTopNDao.getAreaBlockTop10ProtocolOf24hLastTime(end);
-                String time = DateUtils.formatDateTime(lastTime);
-                time = DateUtils.getRangeOfday(time);
-                list = blockingTopNDao.getAreaBlockTop10ProtocolOf24hOnly(start, time, DateUtils.getAfter24h(time));
+                if (lastTime != null) {
+                    String time = DateUtils.formatDateTime(lastTime);
+                    time = DateUtils.getRangeOfday(time);
+                    list = blockingTopNDao.getAreaBlockTop10ProtocolOf24hOnly(start, time, DateUtils.getAfter24h(time));
+                } else {
+                    logger.warn("24小时内区域阻断协议TOP10\tNTC_ENTRANCE_REPORT\t无数据");
+                }
             } catch (Exception e) {
                 logger.error("24小时内区域阻断协议TOP10\t最近数据\t查询异常\tserviceImpl", e);
             }
@@ -247,9 +273,13 @@ public class BlockingTopNServiceImpl implements BlockingTopNService {
             logger.warn("5分钟内全国阻断URLTOP10\tNTC_REJECT_URL_STATISTIC\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
             try {
                 Date lastTime = blockingTopNDao.getBlockTop10URLOf5mLastTime(end);
-                String time = DateUtils.formatDateTime(lastTime);
-                time = DateUtils.getRangeOf5min(time);
-                list = blockingTopNDao.getBlockTop10URLOf5m(start, time, DateUtils.getAfter5min(time));
+                if (lastTime != null) {
+                    String time = DateUtils.formatDateTime(lastTime);
+                    time = DateUtils.getRangeOf5min(time);
+                    list = blockingTopNDao.getBlockTop10URLOf5m(start, time, DateUtils.getAfter5min(time));
+                } else {
+                    logger.warn("5分钟内全国阻断URLTOP10\tNTC_REJECT_URL_STATISTIC\t无数据");
+                }
             } catch (Exception e) {
                 logger.error("5分钟内全国阻断URLTOP10\t最近数据\t查询异常\tserviceImpl", e);
             }
@@ -303,9 +333,13 @@ public class BlockingTopNServiceImpl implements BlockingTopNService {
             logger.warn("5分钟内全国阻断网站TOP10\tNTC_REJECT_WEBSITE_STATISTIC\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
             try {
                 Date lastTime = blockingTopNDao.getBlockTop10WebsiteOf5mLastTime(end);
-                String time = DateUtils.formatDateTime(lastTime);
-                time = DateUtils.getRangeOf5min(time);
-                list = blockingTopNDao.getBlockTop10WebsiteOf5m(start, time, DateUtils.getAfter5min(time));
+                if (lastTime != null) {
+                    String time = DateUtils.formatDateTime(lastTime);
+                    time = DateUtils.getRangeOf5min(time);
+                    list = blockingTopNDao.getBlockTop10WebsiteOf5m(start, time, DateUtils.getAfter5min(time));
+                } else {
+                    logger.warn("5分钟内全国阻断网站TOP10\tNTC_REJECT_WEBSITE_STATISTIC\t无数据");
+                }
             } catch (Exception e) {
                 logger.error("5分钟内全国阻断网站TOP10\t最近数据\t查询异常\tserviceImpl", e);
             }
@@ -359,9 +393,13 @@ public class BlockingTopNServiceImpl implements BlockingTopNService {
             logger.warn("1小时内全国阻断标签TOP10\tNTC_TAG_REPORT\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
             try {
                 Date lastTime = blockingTopNDao.getBlockTop10Tag5mOnlyLastTime(end);
-                String time = DateUtils.formatDateTime(lastTime);
-                time = DateUtils.getRangeOfhour(time);
-                list = blockingTopNDao.getBlockTop10Tag5mOnly(start, time, DateUtils.getAfter1h(time));
+                if (lastTime != null) {
+                    String time = DateUtils.formatDateTime(lastTime);
+                    time = DateUtils.getRangeOfhour(time);
+                    list = blockingTopNDao.getBlockTop10Tag5mOnly(start, time, DateUtils.getAfter1h(time));
+                } else {
+                    logger.warn("1小时内全国阻断标签TOP10\tNTC_TAG_REPORT\t无数据");
+                }
             } catch (Exception e) {
                 logger.error("1小时内全国阻断标签TOP10\t最近数据\t查询异常\tserviceImpl", e);
             }
diff --git a/src/main/java/com/nis/galaxy/web/service/impl/EventsServiceImpl.java b/src/main/java/com/nis/galaxy/web/service/impl/EventsServiceImpl.java
index 919ec30..894cc57 100644
--- a/src/main/java/com/nis/galaxy/web/service/impl/EventsServiceImpl.java
+++ b/src/main/java/com/nis/galaxy/web/service/impl/EventsServiceImpl.java
@@ -36,8 +36,13 @@ public class EventsServiceImpl implements EventsService {
 
     //业务表
     public Map<String, NtcServiceDict> listNtcService() {
-        return MyLoad.listNtcService;
-    }
+        Map<String, NtcServiceDict> listNtcService = MyLoad.listNtcService;
+        if (listNtcService == null || listNtcService.size() == 0) {
+            logger.warn("业务表无数据");
+            listNtcService = new HashMap<>();
+        }
+        return listNtcService;
+}
 
     /**
      * 系统总计
@@ -59,9 +64,13 @@ public class EventsServiceImpl implements EventsService {
             logger.warn("系统总计\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
             try {
                 Date lastTime = eventsDao.getSystemTotalOf1DayLastTime(end);
-                String time = DateUtils.formatDateTime(lastTime);
-                time = DateUtils.getRangeOfday(time);
-                list = eventsDao.getSystemTotalOf1Day(start, time, DateUtils.getAfter24h(time));
+                if (lastTime != null) {
+                    String time = DateUtils.formatDateTime(lastTime);
+                    time = DateUtils.getRangeOfday(time);
+                    list = eventsDao.getSystemTotalOf1Day(start, time, DateUtils.getAfter24h(time));
+                } else {
+                    logger.warn("系统总计\t无数据");
+                }
             } catch (Exception e) {
                 logger.error("系统总计\t最近数据\t查询异常\tserviceImpl", e);
             }
@@ -95,9 +104,13 @@ public class EventsServiceImpl implements EventsService {
             logger.warn("特定APP访问监控\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
             try {
                 Date lastTime = eventsDao.getSpecifiedAPPMonitorLastTime(end);
-                String time = DateUtils.formatDateTime(lastTime);
-                time = DateUtils.getRangeOfhour(time);
-                list = eventsDao.getSpecifiedAPPMonitor(start, time, DateUtils.getAfter1h(time));
+                if (lastTime != null) {
+                    String time = DateUtils.formatDateTime(lastTime);
+                    time = DateUtils.getRangeOfhour(time);
+                    list = eventsDao.getSpecifiedAPPMonitor(start, time, DateUtils.getAfter1h(time));
+                } else {
+                    logger.warn("特定APP访问监控\t无数据");
+                }
             } catch (Exception e) {
                 logger.error("特定APP访问监控\t最近数据\t查询异常\tserviceImpl", e);
             }
@@ -164,9 +177,13 @@ public class EventsServiceImpl implements EventsService {
             logger.warn("业务类型统计报表\tNTC_SERVICE_REPORT\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
             try {
                 Date lastTime = eventsDao.getServiceCountLastTime(end);
-                String time = DateUtils.formatDateTime(lastTime);
-                time = DateUtils.getRangeOfhour(time);
-                list = eventsDao.getServiceCount(start, time, DateUtils.getAfter1h(time));
+                if (lastTime != null) {
+                    String time = DateUtils.formatDateTime(lastTime);
+                    time = DateUtils.getRangeOfhour(time);
+                    list = eventsDao.getServiceCount(start, time, DateUtils.getAfter1h(time));
+                } else {
+                    logger.warn("业务类型统计报表\tNTC_SERVICE_REPORT\t无数据");
+                }
             } catch (Exception e) {
                 logger.error("业务类型统计报表\t最近数据\t查询异常\tserviceImpl", e);
             }
@@ -330,9 +347,13 @@ public class EventsServiceImpl implements EventsService {
             logger.warn("音频监控\tMM_AUDIO_REPORT\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
             try {
                 Date lastTime = eventsDao.getEventsAudioMonitorLastTime(end);
-                String time = DateUtils.formatDateTime(lastTime);
-                time = DateUtils.getRangeOfhour(time);
-                list = eventsDao.getEventsAudioMonitor(start, time, DateUtils.getAfter1h(time));
+                if (lastTime != null) {
+                    String time = DateUtils.formatDateTime(lastTime);
+                    time = DateUtils.getRangeOfhour(time);
+                    list = eventsDao.getEventsAudioMonitor(start, time, DateUtils.getAfter1h(time));
+                } else {
+                    logger.warn("音频监控\tMM_AUDIO_REPORT\t无数据");
+                }
             } catch (Exception e) {
                 logger.error("音频监控\t最近数据\t查询异常\tserviceImpl", e);
             }
@@ -375,9 +396,13 @@ public class EventsServiceImpl implements EventsService {
             logger.warn("视频监控\tMM_VIDEO_REPORT\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
             try {
                 Date lastTime = eventsDao.getVedioMonitorLastTime(end);
-                String time = DateUtils.formatDateTime(lastTime);
-                time = DateUtils.getRangeOfhour(time);
-                list = eventsDao.getVedioMonitor(start, time, DateUtils.getAfter1h(time));
+                if (lastTime != null) {
+                    String time = DateUtils.formatDateTime(lastTime);
+                    time = DateUtils.getRangeOfhour(time);
+                    list = eventsDao.getVedioMonitor(start, time, DateUtils.getAfter1h(time));
+                } else {
+                    logger.warn("视频监控\tMM_VIDEO_REPORT\t无数据");
+                }
             } catch (Exception e) {
                 logger.error("视频监控\t最近数据\t查询异常\tserviceImpl", e);
             }
@@ -420,9 +445,13 @@ public class EventsServiceImpl implements EventsService {
             logger.warn("图片监控\tMM_PIC_REPORT" + start + "至" + end + "\t期间无数据\t查询最近数据");
             try {
                 Date lastTime = eventsDao.getImageMonitorLastTime(end);
-                String time = DateUtils.formatDateTime(lastTime);
-                time = DateUtils.getRangeOfhour(time);
-                list = eventsDao.getImageMonitor(start, time, DateUtils.getAfter1h(time));
+                if (lastTime != null) {
+                    String time = DateUtils.formatDateTime(lastTime);
+                    time = DateUtils.getRangeOfhour(time);
+                    list = eventsDao.getImageMonitor(start, time, DateUtils.getAfter1h(time));
+                } else {
+                    logger.warn("图片监控\tMM_PIC_REPORT\t无数据");
+                }
             } catch (Exception e) {
                 logger.error("图片监控\t最近数据\t查询异常\tserviceImpl", e);
             }
@@ -464,9 +493,13 @@ public class EventsServiceImpl implements EventsService {
             logger.warn("VOIP监控\tMM_VOIP_REPORT\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
             try {
                 Date lastTime = eventsDao.getVoipMonitorLastTime(end);
-                String time = DateUtils.formatDateTime(lastTime);
-                time = DateUtils.getRangeOfhour(time);
-                list = eventsDao.getVoipMonitor(start, time, DateUtils.getAfter1h(time));
+                if (lastTime != null) {
+                    String time = DateUtils.formatDateTime(lastTime);
+                    time = DateUtils.getRangeOfhour(time);
+                    list = eventsDao.getVoipMonitor(start, time, DateUtils.getAfter1h(time));
+                } else {
+                    logger.warn("VOIP监控\tMM_VOIP_REPORT\t无数据");
+                }
             } catch (Exception e) {
                 logger.error("VOIP监控\t最近数据\t查询异常\tserviceImpl", e);
             }
@@ -525,9 +558,13 @@ public class EventsServiceImpl implements EventsService {
             logger.warn("目标行为网络监测\tNTC_RADIUS_REPORT\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
             try {
                 Date lastTime = eventsDao.getTargetNetworkLastTime(end);
-                String time = DateUtils.formatDateTime(lastTime);
-                time = DateUtils.getRangeOfday(time);
-                list = eventsDao.getTargetNetwork(start, time, DateUtils.getAfter24h(time));
+                if (lastTime != null) {
+                    String time = DateUtils.formatDateTime(lastTime);
+                    time = DateUtils.getRangeOfday(time);
+                    list = eventsDao.getTargetNetwork(start, time, DateUtils.getAfter24h(time));
+                } else {
+                    logger.warn("目标行为网络监测\tNTC_RADIUS_REPORT\t无数据");
+                }
             } catch (Exception e) {
                 logger.error("目标行为网络监测\t最近数据\t查询异常\tserviceImpl", e);
             }
@@ -582,10 +619,14 @@ public class EventsServiceImpl implements EventsService {
             logger.warn("运行状况\tPXY_TOTAL_REPORT\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
             try {
                 Date lastTime = eventsDao.getRunningStateLastTime(end);
-                String time = DateUtils.formatDateTime(lastTime);
-                time = DateUtils.getRangeOfhour(time);
-                list = eventsDao.getRunningState(start, time, DateUtils.getAfter1h(time));
-                list.removeAll(Collections.singleton(null));
+                if (lastTime != null) {
+                    String time = DateUtils.formatDateTime(lastTime);
+                    time = DateUtils.getRangeOfhour(time);
+                    list = eventsDao.getRunningState(start, time, DateUtils.getAfter1h(time));
+                    list.removeAll(Collections.singleton(null));
+                } else {
+                    logger.warn("运行状况\tPXY_TOTAL_REPORT\t无数据");
+                }
             } catch (Exception e) {
                 logger.error("运行状况\t最近数据\t查询异常\tserviceImpl", e);
             }
diff --git a/src/main/java/com/nis/galaxy/web/service/impl/MonitorServiceImpl.java b/src/main/java/com/nis/galaxy/web/service/impl/MonitorServiceImpl.java
index af7c50b..acab462 100644
--- a/src/main/java/com/nis/galaxy/web/service/impl/MonitorServiceImpl.java
+++ b/src/main/java/com/nis/galaxy/web/service/impl/MonitorServiceImpl.java
@@ -29,7 +29,12 @@ public class MonitorServiceImpl implements MonitorService {
 
     //地域表
     public Map<String, AreaDictInfo> listAreaDictInfo() {
-        return MyLoad.listAreaDictInfo;
+        Map<String, AreaDictInfo> listAreaDictInfo = MyLoad.listAreaDictInfo;
+        if (listAreaDictInfo == null || listAreaDictInfo.size() == 0) {
+            logger.warn("地域表无数据");
+            listAreaDictInfo = new HashMap<>();
+        }
+        return listAreaDictInfo;
     }
 
     /**
@@ -117,9 +122,13 @@ public class MonitorServiceImpl implements MonitorService {
             logger.warn("网络流量监控\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
             try {
                 Date lastTime = monitorDao.getNetWaterMonitorLastTime(end);
-                String time = DateUtils.formatDateTime(lastTime);
-                time = DateUtils.getRangeOf5min(time);
-                list = monitorDao.getNetWaterMonitor(start, time, DateUtils.getAfter5min(time), DateUtils.getBeforeNminOfTime(time, -5));
+                if (lastTime != null) {
+                    String time = DateUtils.formatDateTime(lastTime);
+                    time = DateUtils.getRangeOf5min(time);
+                    list = monitorDao.getNetWaterMonitor(start, time, DateUtils.getAfter5min(time), DateUtils.getBeforeNminOfTime(time, -5));
+                } else {
+                    logger.warn("网络流量监控\t无数据");
+                }
             } catch (Exception e) {
                 logger.error("网络流量监控\t最近数据\t查询异常\tserviceImpl", e);
             }
diff --git a/src/main/java/com/nis/galaxy/web/service/impl/NetflowServiceImpl.java b/src/main/java/com/nis/galaxy/web/service/impl/NetflowServiceImpl.java
index 785138c..a982b43 100644
--- a/src/main/java/com/nis/galaxy/web/service/impl/NetflowServiceImpl.java
+++ b/src/main/java/com/nis/galaxy/web/service/impl/NetflowServiceImpl.java
@@ -40,12 +40,21 @@ public class NetflowServiceImpl implements NetflowService {
 
     //协议表
     public Map<String, String> listProtocolDict() {
-        return MyLoad.listProtocolDict;
+        Map<String, String> listProtocolDict = MyLoad.listProtocolDict;
+        if (listProtocolDict == null || listProtocolDict.size() == 0) {
+            logger.warn("协议表无数据");
+        }
+        return listProtocolDict;
     }
 
     //地域表
     public Map<String, AreaDictInfo> listAreaDictInfo() {
-        return MyLoad.listAreaDictInfo;
+        Map<String, AreaDictInfo> listAreaDictInfo = MyLoad.listAreaDictInfo;
+        if (listAreaDictInfo == null || listAreaDictInfo.size() == 0) {
+            logger.warn("地域表无数据");
+            listAreaDictInfo = new HashMap<>();
+        }
+        return listAreaDictInfo;
     }
 
     /**
@@ -69,9 +78,13 @@ public class NetflowServiceImpl implements NetflowService {
             logger.warn("5分钟内网络流量统计\tTRAFFIC_PROTOCOL_STATISTIC\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
             try {
                 Date lastTime = netflowDao.getNetflowStatistic5mLastTime(end);
-                String time = DateUtils.formatDateTime(lastTime);
-                time = DateUtils.getRangeOf5min(time);
-                list = netflowDao.getNetflowStatistic5mOnly(start, time, DateUtils.getAfter5min(time));
+                if (lastTime != null) {
+                    String time = DateUtils.formatDateTime(lastTime);
+                    time = DateUtils.getRangeOf5min(time);
+                    list = netflowDao.getNetflowStatistic5mOnly(start, time, DateUtils.getAfter5min(time));
+                } else {
+                    logger.warn("5分钟内网络流量统计\tTRAFFIC_PROTOCOL_STATISTIC\t无数据");
+                }
             } catch (Exception e) {
                 logger.error("5分钟内网络流量统计\t最近数据\t查询异常\tserviceImpl", e);
             }
@@ -87,7 +100,7 @@ public class NetflowServiceImpl implements NetflowService {
                 }
             }
         }
-        logger.info("5分钟内网络流量统计耗时："+(System.currentTimeMillis()-timeMillisStart));
+        logger.info("5分钟内网络流量统计耗时：" + (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
             logger.info("5分钟内网络流量统计------->测试数据");
             int i = (int) (Math.random() * 1000);
@@ -124,9 +137,13 @@ public class NetflowServiceImpl implements NetflowService {
             logger.warn("1小时内网络协议统计\tTRAFFIC_PROTOCOL_STATISTIC\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
             try {
                 Date lastTime = netflowDao.getProtocolStatisticOf1hLastTime(end);
-                String time = DateUtils.formatDateTime(lastTime);
-                time = DateUtils.getRangeOf5min(time);
-                list = netflowDao.getProtocolStatisticOf1hOnly(start, time, DateUtils.getAfter5min(time));
+                if (lastTime != null) {
+                    String time = DateUtils.formatDateTime(lastTime);
+                    time = DateUtils.getRangeOf5min(time);
+                    list = netflowDao.getProtocolStatisticOf1hOnly(start, time, DateUtils.getAfter5min(time));
+                } else {
+                    logger.warn("1小时内网络协议统计\tTRAFFIC_PROTOCOL_STATISTIC\t无数据");
+                }
             } catch (Exception e) {
                 logger.error("1小时内网络协议统计\t最近数据\t查询异常\tserviceImpl", e);
             }
@@ -144,7 +161,7 @@ public class NetflowServiceImpl implements NetflowService {
                 }
             }
         }
-        logger.info("1小时内网络协议统计耗时："+(System.currentTimeMillis()-timeMillisStart));
+        logger.info("1小时内网络协议统计耗时：" + (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
             logger.info("1小时内网络协议统计------->测试数据");
             int i = (int) (Math.random() * 5000);
@@ -182,9 +199,13 @@ public class NetflowServiceImpl implements NetflowService {
             logger.warn("5分钟内活跃IP信息\tTRAFFIC_IP_ACTIVE_STATISTIC\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
             try {
                 Date lastTime = netflowDao.getIpActiveInfoOf5minLastTime(end);
-                String time = DateUtils.formatDateTime(lastTime);
-                time = DateUtils.getRangeOf5min(time);
-                list = netflowDao.getIpActiveInfoOf5minOnly(start, time, DateUtils.getAfter5min(time));
+                if (lastTime != null) {
+                    String time = DateUtils.formatDateTime(lastTime);
+                    time = DateUtils.getRangeOf5min(time);
+                    list = netflowDao.getIpActiveInfoOf5minOnly(start, time, DateUtils.getAfter5min(time));
+                } else {
+                    logger.warn("5分钟内活跃IP信息\tTRAFFIC_IP_ACTIVE_STATISTIC\t无数据");
+                }
             } catch (Exception e) {
                 logger.error("5分钟内活跃IP信息\t最近数据\t查询异常\tserviceImpl", e);
             }
@@ -204,7 +225,7 @@ public class NetflowServiceImpl implements NetflowService {
                 }
             }
         }
-        logger.info("5分钟内活跃IP信息耗时："+(System.currentTimeMillis()-timeMillisStart));
+        logger.info("5分钟内活跃IP信息耗时：" + (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
             logger.info("5分钟内活跃IP信息------->测试数据");
             long c = (long) (Math.random() * 5000000);
@@ -250,9 +271,13 @@ public class NetflowServiceImpl implements NetflowService {
             logger.warn("地域流量\tTRAFFIC_NETFLOW_PORT_INFO\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
             try {
                 Date lastTime = netflowDao.getAreaNetflowOf5minLastTime(end);
-                String time = DateUtils.formatDateTime(lastTime);
-                time = DateUtils.getRangeOf5min(time);
-                list = netflowDao.getAreaNetflowOf5min(start, time, DateUtils.getAfter5min(time));
+                if (lastTime != null) {
+                    String time = DateUtils.formatDateTime(lastTime);
+                    time = DateUtils.getRangeOf5min(time);
+                    list = netflowDao.getAreaNetflowOf5min(start, time, DateUtils.getAfter5min(time));
+                } else {
+                    logger.warn("地域流量\tTRAFFIC_NETFLOW_PORT_INFO\t无数据");
+                }
             } catch (Exception e) {
                 logger.error("地域流量\t最近数据\t查询异常\tserviceImpl", e);
             }
@@ -272,7 +297,7 @@ public class NetflowServiceImpl implements NetflowService {
                 }
             }
         }
-        logger.info("地域流量耗时："+(System.currentTimeMillis()-timeMillisStart));
+        logger.info("地域流量耗时：" + (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
             logger.info("地域流量------->测试数据");
             if (ConfigUtil.languageChose == 3) {
@@ -315,14 +340,18 @@ public class NetflowServiceImpl implements NetflowService {
             logger.warn("端口流量\tTRAFFIC_NETFLOW_PORT_INFO\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
             try {
                 Date lastTime = netflowDao.getPortNetflowOf5minLastTime(end);
-                String time = DateUtils.formatDateTime(lastTime);
-                time = DateUtils.getRangeOf5min(time);
-                list = netflowDao.getPortNetflowOf5min(start, time, DateUtils.getAfter5min(time));
+                if (lastTime != null) {
+                    String time = DateUtils.formatDateTime(lastTime);
+                    time = DateUtils.getRangeOf5min(time);
+                    list = netflowDao.getPortNetflowOf5min(start, time, DateUtils.getAfter5min(time));
+                } else {
+                    logger.warn("端口流量\tTRAFFIC_NETFLOW_PORT_INFO\t无数据");
+                }
             } catch (Exception e) {
                 logger.error("端口流量\t最近数据\t查询异常\tserviceImpl", e);
             }
         }
-        logger.info("端口流量耗时："+(System.currentTimeMillis()-timeMillisStart));
+        logger.info("端口流量耗时：" + (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
             list = new ArrayList<>();
             logger.info("端口流量------->测试数据");
diff --git a/src/main/java/com/nis/galaxy/web/service/impl/NetflowTopNServiceImpl.java b/src/main/java/com/nis/galaxy/web/service/impl/NetflowTopNServiceImpl.java
index c0b91bd..5a92e4d 100644
--- a/src/main/java/com/nis/galaxy/web/service/impl/NetflowTopNServiceImpl.java
+++ b/src/main/java/com/nis/galaxy/web/service/impl/NetflowTopNServiceImpl.java
@@ -28,7 +28,12 @@ public class NetflowTopNServiceImpl implements NetflowTopNService {
 
     //地域表
     public Map<String, AreaDictInfo> listAreaDictInfo() {
-        return MyLoad.listAreaDictInfo;
+        Map<String, AreaDictInfo> listAreaDictInfo = MyLoad.listAreaDictInfo;
+        if (listAreaDictInfo == null || listAreaDictInfo.size() == 0) {
+            logger.warn("地域表无数据");
+            listAreaDictInfo = new HashMap<>();
+        }
+        return listAreaDictInfo;
     }
 
     /**
@@ -52,9 +57,13 @@ public class NetflowTopNServiceImpl implements NetflowTopNService {
             logger.warn("5分钟内活跃IP流量TOP10\tTRAFFIC_IP_ACTIVE_STATISTIC\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
             try {
                 Date lastTime = netflowTopNDao.getIpActiveStatisticOf5mLastTime(end);
-                String time = DateUtils.formatDateTime(lastTime);
-                time = DateUtils.getRangeOf5min(time);
-                list = netflowTopNDao.getIpActiveStatisticOf5mOnly(start, time, DateUtils.getAfter5min(time));
+                if (lastTime != null) {
+                    String time = DateUtils.formatDateTime(lastTime);
+                    time = DateUtils.getRangeOf5min(time);
+                    list = netflowTopNDao.getIpActiveStatisticOf5mOnly(start, time, DateUtils.getAfter5min(time));
+                } else {
+                    logger.warn("5分钟内活跃IP流量TOP10\tTRAFFIC_IP_ACTIVE_STATISTIC\t无数据");
+                }
             } catch (Exception e) {
                 logger.error("5分钟内活跃IP流量TOP10\t最近数据\t查询异常\tserviceImpl", e);
             }
@@ -123,18 +132,22 @@ public class NetflowTopNServiceImpl implements NetflowTopNService {
             logger.warn("互联网流量TOP10\tTRAFFIC_NETFLOW_PORT_INFO\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
             try {
                 Date lastTime = netflowTopNDao.getNetFlowWaterTop10LastTime(end);
-                String time = DateUtils.formatDateTime(lastTime);
-                time = DateUtils.getRangeOf5min(time);
-                String lastEnd = DateUtils.getAfter5min(time);
-                String lastStart = null;
-                if (range == 1) {
-                    lastStart = DateUtils.getBeforeNminOfTime(lastEnd, -60);
-                } else if (range == 7) {
-                    lastStart = DateUtils.getBeforeNminOfTime(lastEnd, -60 * 24 * 7);
+                if (lastTime != null) {
+                    String time = DateUtils.formatDateTime(lastTime);
+                    time = DateUtils.getRangeOf5min(time);
+                    String lastEnd = DateUtils.getAfter5min(time);
+                    String lastStart = null;
+                    if (range == 1) {
+                        lastStart = DateUtils.getBeforeNminOfTime(lastEnd, -60);
+                    } else if (range == 7) {
+                        lastStart = DateUtils.getBeforeNminOfTime(lastEnd, -60 * 24 * 7);
+                    } else {
+                        lastStart = DateUtils.getBeforeNminOfTime(lastEnd, -60 * 24);
+                    }
+                    list = netflowTopNDao.getNetFlowWaterTop10(lastStart, lastEnd);
                 } else {
-                    lastStart = DateUtils.getBeforeNminOfTime(lastEnd, -60 * 24);
+                    logger.warn("互联网流量TOP10\tTRAFFIC_NETFLOW_PORT_INFO\t无数据");
                 }
-                list = netflowTopNDao.getNetFlowWaterTop10(lastStart, lastEnd);
             } catch (Exception e) {
                 logger.error("互联网流量TOP10\t最近数据\t查询异常\tserviceImpl", e);
             }