1.修改系统监控接口

2.将字典表的读取方法加入到子线程池Asycn中
3.application.yml增加配置

10 files changed, 34 insertions, 53 deletions

diff --git a/config/application.yml b/config/application.yml
index f5c8aa5..7a2ba0b 100644
--- a/config/application.yml
+++ b/config/application.yml
@@ -13,4 +13,12 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     initialSize: 25
     maxActive: 50
-    validationQuery: select 1
+    validationQuery: select 1 FROM DUAL
+    maxWait: 60000                                             # 配置获取连接等待超时的时间
+    timeBetweenEvictionRunsMillis: 60000                    # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+    minEvictableIdleTimeMillis: 300000                      # 配置一个连接在池中最小生存的时间，单位是毫秒
+    testWhileIdle: true
+    testOnBorrow: true
+    testOnReturn: true
+    poolPreparedStatements: true                             # 打开PSCache，并且指定每个连接上PSCache的大小
+    maxPoolPreparedStatementPerConnectionSize: 20
diff --git a/pom.xml b/pom.xml
index b7addc7..3f02347 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
-        <skipTests>true</skipTests>
+        <!--<skipTests>true</skipTests>-->
     </properties>
 
     <dependencies>
diff --git a/src/main/java/com/nis/galaxy/config/MyLoad.java b/src/main/java/com/nis/galaxy/config/MyLoad.java
index fdbd82f..8f47530 100644
--- a/src/main/java/com/nis/galaxy/config/MyLoad.java
+++ b/src/main/java/com/nis/galaxy/config/MyLoad.java
@@ -2,6 +2,7 @@ package com.nis.galaxy.config;
 
 import com.nis.galaxy.domain.dict.*;
 import com.nis.galaxy.util.ConfigUtil;
+import com.nis.galaxy.util.ListUtils;
 import com.nis.galaxy.web.service.DictService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -25,6 +26,7 @@ import java.util.concurrent.ConcurrentHashMap;
 
 @Component
 @Order(1)
+@Async
 public class MyLoad {
     protected final Logger logger = LoggerFactory.getLogger(this.getClass());
     private int a = 1;
@@ -34,38 +36,20 @@ public class MyLoad {
     /**
      * 业务表
      */
-    public Map<String, NtcServiceDict> listNtcService = new ConcurrentHashMap<>();
+    public static Map<String, NtcServiceDict> listNtcService = new ConcurrentHashMap<>();
     /**
      * 协议表
      */
-    public Map<String, String> listProtocolDict = new ConcurrentHashMap<>();
+    public static Map<String, String> listProtocolDict = new ConcurrentHashMap<>();
     ;
     /**
      * 标签表
      */
-    public Map<String, UiTagDictInfo> listUiTagDicInfo = new ConcurrentHashMap<>();
+    public static Map<String, UiTagDictInfo> listUiTagDicInfo = new ConcurrentHashMap<>();
     /**
      * 地域表
      */
-    public Map<String, AreaDictInfo> listAreaDictInfo = new HashMap<>();
-
-    public Map<String, AreaDictInfo> getlistAreaDictInfo() {
-        return listAreaDictInfo;
-    }
-
-
-    public Map<String, UiTagDictInfo> getListUiTagDicInfo() {
-        return listUiTagDicInfo;
-    }
-
-    public Map<String, String> getListProtocolDict() {
-        return listProtocolDict;
-    }
-
-    @Scheduled(cron = "${dict.service.cron.plan}")
-    public Map<String, NtcServiceDict> getListNtcService() {
-        return listNtcService;
-    }
+    public static Map<String, AreaDictInfo> listAreaDictInfo = new HashMap<>();
 
 
     @Scheduled(cron = "${dict.service.cron.plan}")
@@ -77,7 +61,7 @@ public class MyLoad {
         } catch (Exception e) {
             logger.error("业务表加载出现异常", e);
         }
-        if (!ntcServiceDict.isEmpty()) {
+        if (!ListUtils.isEmptyList(ntcServiceDict)) {
             for (NtcServiceDict serviceDict : ntcServiceDict) {
                 mapNtcService.put(String.valueOf(serviceDict.getServiceCode()), serviceDict);
             }
@@ -87,6 +71,7 @@ public class MyLoad {
             logger.info("业务类型加载个数为\t" + listNtcService.size());
         } else {
             logger.info("listNtcService为null");
+            listNtcService = new HashMap<>();
         }
     }
 
@@ -99,7 +84,7 @@ public class MyLoad {
         } catch (Exception e) {
             logger.error("协议表加载出现异常", e);
         }
-        if (!protocolDict.isEmpty()) {
+        if (!ListUtils.isEmptyList(protocolDict)) {
             for (ProtocolDict dict : protocolDict) {
                 mapProtocolDict.put(dict.getViewCode(), dict.getProtocolType());
             }
@@ -109,6 +94,7 @@ public class MyLoad {
             logger.info("协议加载个数为\t" + listProtocolDict.size());
         } else {
             logger.info("listNtcService为null");
+            listProtocolDict = new HashMap<>();
         }
     }
 
@@ -121,7 +107,7 @@ public class MyLoad {
         } catch (Exception e) {
             logger.error("标签表加载出现异常", e);
         }
-        if (!uiTagDicInfo.isEmpty()) {
+        if (!ListUtils.isEmptyList(uiTagDicInfo)) {
             for (UiTagDictInfo tagDicInfo : uiTagDicInfo) {
                 mapUiTagDicInfo.put(tagDicInfo.getTagId(), tagDicInfo);
             }
@@ -131,6 +117,7 @@ public class MyLoad {
             logger.info("标签加载个数为\t" + listUiTagDicInfo.size());
         } else {
             logger.info("listUiTagDicInfo为null");
+            listUiTagDicInfo = new HashMap<>();
         }
     }
 
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 6040e96..6a6d552 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
@@ -27,18 +27,16 @@ public class BlockingServiceImp implements BlockingService {
     @Autowired
     BlockingDao blockingDao;
     @Autowired
-    MyLoad myLoad;
-    @Autowired
     DictService dictService;
 
     //地域表
     public Map<String, AreaDictInfo> listAreaDictInfo() {
-        return myLoad.listAreaDictInfo;
+        return MyLoad.listAreaDictInfo;
     }
 
     //业务表
     public Map<String, NtcServiceDict> listNtcService() {
-        return myLoad.listNtcService;
+        return MyLoad.listNtcService;
     }
 
     /**
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 4b239dd..96536bd 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
@@ -23,24 +23,22 @@ public class BlockingTopNServiceImpl implements BlockingTopNService {
 
     @Autowired
     BlockingTopNDao blockingTopNDao;
-    @Autowired
-    MyLoad myLoad;
 
 
 
     //地域表
     public Map<String, AreaDictInfo> listAreaDictInfo() {
-        return myLoad.listAreaDictInfo;
+        return MyLoad.listAreaDictInfo;
     }
 
     //标签表
     public Map<String, UiTagDictInfo> listUiTagDicInfo() {
-        return myLoad.listUiTagDicInfo;
+        return MyLoad.listUiTagDicInfo;
     }
 
     //业务表
     public Map<String, NtcServiceDict> listNtcService() {
-        return myLoad.listNtcService;
+        return MyLoad.listNtcService;
     }
 
     /**
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 5ff15d9..919ec30 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
@@ -22,8 +22,6 @@ public class EventsServiceImpl implements EventsService {
 
     @Autowired
     EventsDao eventsDao;
-    @Autowired
-    MyLoad myLoad;
 
     @Value("${Device.Server.Num}")
     private int DeviceServerNum;
@@ -38,7 +36,7 @@ public class EventsServiceImpl implements EventsService {
 
     //业务表
     public Map<String, NtcServiceDict> listNtcService() {
-        return myLoad.listNtcService;
+        return MyLoad.listNtcService;
     }
 
     /**
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 1d202e4..1eca5e8 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
@@ -26,12 +26,10 @@ public class MonitorServiceImpl implements MonitorService {
 
     @Autowired
     MonitorDao monitorDao;
-    @Autowired
-    MyLoad myLoad;
 
     //地域表
     public Map<String, AreaDictInfo> listAreaDictInfo() {
-        return myLoad.listAreaDictInfo;
+        return MyLoad.listAreaDictInfo;
     }
 
     /**
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 71b8998..7fce6d1 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
@@ -24,9 +24,6 @@ public class NetflowServiceImpl implements NetflowService {
 
     @Autowired
     NetflowDao netflowDao;
-    @Autowired
-    MyLoad myLoad;
-
     @Value("${server.port}")
     private int serverPort;
 
@@ -43,12 +40,12 @@ public class NetflowServiceImpl implements NetflowService {
 
     //协议表
     public Map<String, String> listProtocolDict() {
-        return myLoad.listProtocolDict;
+        return MyLoad.listProtocolDict;
     }
 
     //地域表
     public Map<String, AreaDictInfo> listAreaDictInfo() {
-        return myLoad.listAreaDictInfo;
+        return MyLoad.listAreaDictInfo;
     }
 
     /**
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 38034e3..ece4084 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
@@ -24,14 +24,11 @@ public class NetflowTopNServiceImpl implements NetflowTopNService {
 
     @Autowired
     NetflowTopNDao netflowTopNDao;
-    @Autowired
-    MyLoad myLoad;
-
 
 
     //地域表
     public Map<String, AreaDictInfo> listAreaDictInfo() {
-        return myLoad.listAreaDictInfo;
+        return MyLoad.listAreaDictInfo;
     }
 
     /**
@@ -101,8 +98,8 @@ public class NetflowTopNServiceImpl implements NetflowTopNService {
         Map<String, AreaDictInfo> listArea = listAreaDictInfo();
         List<NetFlowWater> list = new ArrayList<>();
         List<NetFlowWaterPush> resule = new ArrayList<>();
-        List<Entrance> entrance = netflowTopNDao.getIpEntranceRe();
         long timeMillisStart = System.currentTimeMillis();
+        List<Entrance> entrance = netflowTopNDao.getIpEntranceRe();
         try {
             list = netflowTopNDao.getNetFlowWaterTop10(start, end);
         } catch (Exception e) {
diff --git a/src/main/resources/mybatis/mapper/MonitorMapper.xml b/src/main/resources/mybatis/mapper/MonitorMapper.xml
index 52f0a53..4177d7c 100644
--- a/src/main/resources/mybatis/mapper/MonitorMapper.xml
+++ b/src/main/resources/mybatis/mapper/MonitorMapper.xml
@@ -6,7 +6,7 @@
      SELECT a.time time,area area,a.total total,a.normal normal,a.abnormal abnormal,b.hostname name,b.ip ip
     FROM traffic_abnormal_machine b right JOIN
     (SELECT id,commit_time time,area,total,normal,abnormal from traffic_nmsserver_statistic
-    WHERE commit_time=(SELECT commit_time time FROM traffic_nmsserver_statistic ORDER BY time desc limit 1) limit 1) a
+    WHERE commit_time=(SELECT commit_time time FROM traffic_nmsserver_statistic ORDER BY time desc limit 1)) a
     on b.nmsServer_Id = a.id
     </select>
     <resultMap id="BaseResultMap" type="com.nis.galaxy.domain.NmsServerBean" >