修正音频监控、视频监控、图片监控的节目id都换成String类型（之前是long）、VOIP监控电话号码也换成String类型（之前是long）

17 files changed, 92 insertions, 107 deletions

diff --git a/config/application.properties b/config/application.properties
index db3a067..fad1716 100644
--- a/config/application.properties
+++ b/config/application.properties
@@ -1,20 +1,14 @@
 #服务端口
 server.port=8017
-#此服务的ip和端口本服务的service.port相同
-REST_URL_PREFIX_CHECK=http://127.0.0.1:${server.port}
 #接收方的ip和端口
 #REST_URL_PREFIX_PUSH=http://58.56.56.170:11000
 REST_URL_PREFIX_PUSH=http://127.0.0.1:${server.port}
-#互联网监控接口 true表示开启
-scheduled.netflow.topn.enable=true
-scheduled.netflow.enable=true
-#封堵信息接口 true表示开启
-scheduled.block.enable=true
-scheduled.block.topn.enable=true
-#监控接口 true表示开启
-scheduled.monitor.enable=true
-#事件接口
-scheduled.events.enable=true
+#是否开启测试数据(在真实数据为空时触发)：true表示开启，false表示关闭
+Open.False.Data=false
+#推送请求头字符
+Content-Type=application/json;charset=UTF-8
+#1.中文、2.英文、3.俄语
+Language.Chose=2
 #每个整10s触发一次
 10s.scheduled.cron.plan=*/10 * * * * *
 #每分钟整点触发
@@ -30,6 +24,23 @@ scheduled.events.enable=true
 dict.scheduled.cron.plan=0 1 1 * * *
 #测试用
 1s.scheduled.cron.plan=*/1 * * * * *
+
+#部署设备数量
+Device.Server.Num=10
+Device.CoreSwtich.Num=20
+Device.AccessSwitch.Num=30
+Device.Asem.Num=10
+Device.Adc.Num=30
+#互联网监控接口 true表示开启
+scheduled.netflow.topn.enable=true
+scheduled.netflow.enable=true
+#封堵信息接口 true表示开启
+scheduled.block.enable=true
+scheduled.block.topn.enable=true
+#监控接口 true表示开启
+scheduled.monitor.enable=true
+#事件接口
+scheduled.events.enable=true
 #接收方服务路径
 SERVICE_PATH_BLOCKING=/v1/blocking
 SERVICE_PATH_NETFLOW=/v1/netflow
@@ -44,22 +55,9 @@ DICT.WAIT=5000
 RestTemplate.ConnectTimeout=20000
 #数据传输时间ms
 RestTemplate.SocketTimeout=20000
-#1.中文、2.英文、3.俄语
-Language.Chose=2
-#密钥
-jasypt.encryptor.password=f6car
 
 spring.mvc.view.suffix=.html
 #图片储存地址：1.若不指定怎为同jar目录下的image文件夹中，2.不指定时候key不能去掉
 Image.Path=
-#是否开启假数据(在真实数据为空时)：true表示开启，false表示关闭
-Open.False.Data=false
-#部署设备数量
-Device.Server.Num=10
-Device.CoreSwtich.Num=20
-Device.AccessSwitch.Num=30
-Device.Asem.Num=10
-Device.Adc.Num=30
-
-Content-Type=application/json;charset=UTF-8
-#Content-Type=application/json;charset=GBK
\ No newline at end of file
+#密钥
+jasypt.encryptor.password=f6car
diff --git a/src/main/java/com/nis/galaxy/config/MyLoad.java b/src/main/java/com/nis/galaxy/config/MyLoad.java
index 5428c32..d5f5e6b 100644
--- a/src/main/java/com/nis/galaxy/config/MyLoad.java
+++ b/src/main/java/com/nis/galaxy/config/MyLoad.java
@@ -122,7 +122,7 @@ public class MyLoad {
         }
         if (!protocolDict.isEmpty()) {
             for (ProtocolDict dict : protocolDict) {
-                listProtocolDict.put(String.valueOf(dict.getViewCode()), dict.getProtocolType());
+                listProtocolDict.put(dict.getViewCode(), dict.getProtocolType());
             }
         }
         logger.info("协议表的预加载结果为\t" + listProtocolDict);
diff --git a/src/main/java/com/nis/galaxy/domain/EventsAudioMonitor.java b/src/main/java/com/nis/galaxy/domain/EventsAudioMonitor.java
index 04e9163..6f9327c 100644
--- a/src/main/java/com/nis/galaxy/domain/EventsAudioMonitor.java
+++ b/src/main/java/com/nis/galaxy/domain/EventsAudioMonitor.java
@@ -12,7 +12,7 @@ import lombok.experimental.Accessors;
 @Data
 @Accessors(chain = true)
 public class EventsAudioMonitor {
-    private long audioId;       // 节目id
+    private String audioId;       // 节目id
     private long num;     // 次数
     private String url;      // 现场片段url
 
diff --git a/src/main/java/com/nis/galaxy/domain/EventsImageMonitor.java b/src/main/java/com/nis/galaxy/domain/EventsImageMonitor.java
index 1331884..cdcfda5 100644
--- a/src/main/java/com/nis/galaxy/domain/EventsImageMonitor.java
+++ b/src/main/java/com/nis/galaxy/domain/EventsImageMonitor.java
@@ -12,7 +12,7 @@ import lombok.experimental.Accessors;
 @Data
 @Accessors(chain = true)
 public class EventsImageMonitor {
-    private long imageId;     // 节目id
+    private String imageId;     // 节目id
     private long num;    // 次数
     private String url;   // 现场片段url
 
diff --git a/src/main/java/com/nis/galaxy/domain/EventsVedioMonitor.java b/src/main/java/com/nis/galaxy/domain/EventsVedioMonitor.java
index 0d1bcc4..091ab27 100644
--- a/src/main/java/com/nis/galaxy/domain/EventsVedioMonitor.java
+++ b/src/main/java/com/nis/galaxy/domain/EventsVedioMonitor.java
@@ -12,7 +12,7 @@ import lombok.experimental.Accessors;
 @Data
 @Accessors(chain = true)
 public class EventsVedioMonitor {
-    private long vedioId;       // 节目id
+    private String vedioId;       // 节目id
     private long num;     // 次数
     private String url;      // 现场片段url
 
diff --git a/src/main/java/com/nis/galaxy/domain/EventsVoipMonitor.java b/src/main/java/com/nis/galaxy/domain/EventsVoipMonitor.java
index 7ef596e..2c21f7b 100644
--- a/src/main/java/com/nis/galaxy/domain/EventsVoipMonitor.java
+++ b/src/main/java/com/nis/galaxy/domain/EventsVoipMonitor.java
@@ -12,7 +12,7 @@ import lombok.experimental.Accessors;
 @Data
 @Accessors(chain = true)
 public class EventsVoipMonitor {
-    private long phonenum;// 电话号码
+    private String phonenum;// 电话号码
     private long num;     // 次数
     private String url;      // 现场片段url
 
diff --git a/src/main/java/com/nis/galaxy/domain/dict/ProtocolDict.java b/src/main/java/com/nis/galaxy/domain/dict/ProtocolDict.java
index 8d9212e..c6d4422 100644
--- a/src/main/java/com/nis/galaxy/domain/dict/ProtocolDict.java
+++ b/src/main/java/com/nis/galaxy/domain/dict/ProtocolDict.java
@@ -16,5 +16,5 @@ import lombok.experimental.Accessors;
 @Accessors(chain=true)
 public class ProtocolDict {
     private String protocolType;
-    private int viewCode;
+    private String viewCode;
 }
diff --git a/src/main/java/com/nis/galaxy/template/ForBlockingInterface.java b/src/main/java/com/nis/galaxy/template/ForBlockingInterface.java
index 98b0c64..92ce1c8 100644
--- a/src/main/java/com/nis/galaxy/template/ForBlockingInterface.java
+++ b/src/main/java/com/nis/galaxy/template/ForBlockingInterface.java
@@ -36,8 +36,6 @@ public class ForBlockingInterface {
     private String scheduledBlockEnable;
     @Value("${DICT.WAIT}")
     private int DICTWAIT;
-    @Value("${REST_URL_PREFIX_CHECK}")
-    private String REST_URL_PREFIX_CHECK;
     @Value("${REST_URL_PREFIX_PUSH}")
     private String REST_URL_PREFIX_PUSH;
     @Value("${SERVICE_PATH_BLOCKING}")
@@ -211,9 +209,9 @@ public class ForBlockingInterface {
         }
         // 请求头和请求体
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(),null,"blocking.thermodynamic", contentValue);
-        logger.info("开始推送======>>>热力图\t请求头和请求体：" + httpEntity);
+        logger.info("开始推送======>>>热力图接口\t请求头和请求体：" + httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_BLOCKING, httpEntity);
-        logger.info("热力图\t推送返回结果" + response);
+        logger.info("热力图接口\t推送返回结果" + response);
     }
 
     /**
diff --git a/src/main/java/com/nis/galaxy/template/ForBlockingTopNInterface.java b/src/main/java/com/nis/galaxy/template/ForBlockingTopNInterface.java
index 117512c..a398d8c 100644
--- a/src/main/java/com/nis/galaxy/template/ForBlockingTopNInterface.java
+++ b/src/main/java/com/nis/galaxy/template/ForBlockingTopNInterface.java
@@ -33,8 +33,6 @@ public class ForBlockingTopNInterface {
 
     @Value("${scheduled.block.topn.enable}")
     private String scheduledBlockTopnEnable;
-    @Value("${REST_URL_PREFIX_CHECK}")
-    private String REST_URL_PREFIX_CHECK;
     @Value("${REST_URL_PREFIX_PUSH}")
     private String REST_URL_PREFIX_PUSH;
     @Value("${SERVICE_PATH_BLOCKING}")
diff --git a/src/main/java/com/nis/galaxy/template/ForEventsInterface.java b/src/main/java/com/nis/galaxy/template/ForEventsInterface.java
index f01e7f9..2df3b85 100644
--- a/src/main/java/com/nis/galaxy/template/ForEventsInterface.java
+++ b/src/main/java/com/nis/galaxy/template/ForEventsInterface.java
@@ -37,8 +37,6 @@ public class ForEventsInterface {
 
     @Value("${scheduled.events.enable}")
     private String scheduledEventsEnable;
-    @Value("${REST_URL_PREFIX_CHECK}")
-    private String REST_URL_PREFIX_CHECK;
     @Value("${REST_URL_PREFIX_PUSH}")
     private String REST_URL_PREFIX_PUSH;
     @Value("${SERVICE_PATH_EVENTS}")
diff --git a/src/main/java/com/nis/galaxy/template/ForNetflowInterface.java b/src/main/java/com/nis/galaxy/template/ForNetflowInterface.java
index 27da4fb..b15a900 100644
--- a/src/main/java/com/nis/galaxy/template/ForNetflowInterface.java
+++ b/src/main/java/com/nis/galaxy/template/ForNetflowInterface.java
@@ -34,8 +34,6 @@ public class ForNetflowInterface {
 
     @Value("${scheduled.netflow.enable}")
     private String scheduledNetflowEnable;
-    @Value("${REST_URL_PREFIX_CHECK}")
-    private String REST_URL_PREFIX_CHECK;
     @Value("${REST_URL_PREFIX_PUSH}")
     private String REST_URL_PREFIX_PUSH;
     @Value("${SERVICE_PATH_NETFLOW}")
@@ -124,7 +122,7 @@ public class ForNetflowInterface {
     /**
      * 地域流量 5分钟/次
      */
-    @Scheduled(cron = "${5m.scheduled.cron.plan}")
+    @Scheduled(cron = "${1s.scheduled.cron.plan}")
     public void getAreaNetflowOf5min() {
         if (!Boolean.parseBoolean(scheduledNetflowEnable)) {
             return;
@@ -137,8 +135,7 @@ public class ForNetflowInterface {
             //获取并封装推送数据
             contentValue = netflowService.getAreaNetflowOf5min(start, end, areaNetqueryExpTimes);
         } catch (Exception e) {
-            logger.error("地域流量\t查询异常\trestTemplate", e);
-            areaNetqueryExpTimes++;
+            logger.error("地域流量\t查询异常\trestTemplate\t异常次数："+ ++areaNetqueryExpTimes, e);
         }
         if (areaNetqueryExpTimes > 0 && contentValue != null) {
             //清零查询异常次数
@@ -166,8 +163,7 @@ public class ForNetflowInterface {
         try {
             contentValue = netflowService.getPortNetflowOf5min(start, end, portNetqueryExpTimes);
         } catch (Exception e) {
-            logger.error("端口流量\t查询异常\trestTemplate", e);
-            ++portNetqueryExpTimes;
+            logger.error("端口流量\t查询异常\trestTemplate\t异常次数："+ ++portNetqueryExpTimes, e);
         }
         if (portNetqueryExpTimes > 0 && contentValue != null) {
             //清零查询异常次数
@@ -285,7 +281,7 @@ public class ForNetflowInterface {
         getNetflowStatistic5m();
         getProtocolStatisticOf1h();
         getIpActiveInfoOf5min();
-        //getAreaNetflowOf5min();
+        getAreaNetflowOf5min();
         getPortNetflowOf5min();
         getNetflowMonitorTxt();
         getNetflowMonitorVideo();
diff --git a/src/main/java/com/nis/galaxy/template/ForNetflowTopNInterface.java b/src/main/java/com/nis/galaxy/template/ForNetflowTopNInterface.java
index f9a51a0..c38c613 100644
--- a/src/main/java/com/nis/galaxy/template/ForNetflowTopNInterface.java
+++ b/src/main/java/com/nis/galaxy/template/ForNetflowTopNInterface.java
@@ -31,8 +31,6 @@ public class ForNetflowTopNInterface {
     private int before60m = -60;
     @Value("${scheduled.netflow.topn.enable}")
     private String scheduledNetflowTopnEnable;
-    @Value("${REST_URL_PREFIX_CHECK}")
-    private String REST_URL_PREFIX_CHECK;
     @Value("${REST_URL_PREFIX_PUSH}")
     private String REST_URL_PREFIX_PUSH;
     @Value("${SERVICE_PATH_NETFLOW}")
diff --git a/src/main/java/com/nis/galaxy/web/dao/BlockingDao.java b/src/main/java/com/nis/galaxy/web/dao/BlockingDao.java
index 2d68dda..366907f 100644
--- a/src/main/java/com/nis/galaxy/web/dao/BlockingDao.java
+++ b/src/main/java/com/nis/galaxy/web/dao/BlockingDao.java
@@ -3,6 +3,7 @@ package com.nis.galaxy.web.dao;
 import com.nis.galaxy.domain.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 
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 b4c05bc..d06ea79 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
@@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.sql.Timestamp;
 import java.util.*;
 import java.util.concurrent.CopyOnWriteArrayList;
 
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 cb3f868..4f1c9c7 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
@@ -14,6 +14,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+
 import java.util.*;
 
 @Service
@@ -39,7 +40,6 @@ public class BlockingTopNServiceImpl implements BlockingTopNService {
         return myLoad.listUiCarrierDictInfo;
     }
 
-
     //标签表
     public Map<String, UiTagDictInfo> listUiTagDicInfo() {
         return myLoad.listUiTagDicInfo;
@@ -107,17 +107,17 @@ public class BlockingTopNServiceImpl implements BlockingTopNService {
         try {
             list = blockingTopNDao.getBlockTop10WebsiteOf1h(start, end);
         } catch (Exception e) {
-            logger.error("全国阻断网站TOP10\t查询异常\tserviceImpl", e);
+            logger.error("1小时内全国阻断网站TOP10\t查询异常\tserviceImpl", e);
         }
         if (list.isEmpty()) {
-            logger.warn("全国阻断网站TOP10\tNTC_REJECT_WEBSITE_STATISTIC\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
+            logger.warn("1小时内全国阻断网站TOP10\tNTC_REJECT_WEBSITE_STATISTIC\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
             try {
                 String lastTime = blockingTopNDao.getBlockTop10WebsiteOf1hLastTime(end);
                 String time = DateUtils.getSubstringTime(lastTime);
                 time = DateUtils.getRangeOfhour(time);
                 list = blockingTopNDao.getBlockTop10WebsiteOf1h(time, DateUtils.getAfter1h(time));
             } catch (Exception e) {
-                logger.error("全国阻断网站TOP10\t最近数据\t查询异常\tserviceImpl", e);
+                logger.error("1小时内全国阻断网站TOP10\t最近数据\t查询异常\tserviceImpl", e);
             }
         }
         if (list.isEmpty() && OPENFALSEDATA) {
@@ -190,15 +190,15 @@ public class BlockingTopNServiceImpl implements BlockingTopNService {
         if (list.isEmpty() && OPENFALSEDATA) {
             logger.info("24小时区域阻断协议TOP10------->测试数据");
             int i = (int) (Math.random() * 400);
-                list.add(new AreaBlockProtocol(start, "Kazakhtelecom", "ssl_reject", i + 40));
-                list.add(new AreaBlockProtocol(start, "kazTransCom", "file_transfer_digest_reject", i + 31));
-                list.add(new AreaBlockProtocol(start, "Kazakhtelecom", "p2p_reject", i + 20));
-                list.add(new AreaBlockProtocol(start, "kazTransCom", "encrypted_tunnel_behavior_reject", i + 18));
-                list.add(new AreaBlockProtocol(start, "Kazakhtelecom", "website_dns_monit", i + 17));
-                list.add(new AreaBlockProtocol(start, "Kazakhtelecom", "mail_monit", i + 16));
-                list.add(new AreaBlockProtocol(start, "kazTransCom", "ipsec_monit", i + 10));
-                list.add(new AreaBlockProtocol(start, "Kazakhtelecom", "socks_monit", i + 8));
-                list.add(new AreaBlockProtocol(start, "kazTransCom", "bgp_monit", i + 7));
+            list.add(new AreaBlockProtocol(start, "Kazakhtelecom", "ssl_reject", i + 40));
+            list.add(new AreaBlockProtocol(start, "kazTransCom", "file_transfer_digest_reject", i + 31));
+            list.add(new AreaBlockProtocol(start, "Kazakhtelecom", "p2p_reject", i + 20));
+            list.add(new AreaBlockProtocol(start, "kazTransCom", "encrypted_tunnel_behavior_reject", i + 18));
+            list.add(new AreaBlockProtocol(start, "Kazakhtelecom", "website_dns_monit", i + 17));
+            list.add(new AreaBlockProtocol(start, "Kazakhtelecom", "mail_monit", i + 16));
+            list.add(new AreaBlockProtocol(start, "kazTransCom", "ipsec_monit", i + 10));
+            list.add(new AreaBlockProtocol(start, "Kazakhtelecom", "socks_monit", i + 8));
+            list.add(new AreaBlockProtocol(start, "kazTransCom", "bgp_monit", i + 7));
         }
         return list;
     }
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 6aa0998..64371a6 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
@@ -333,16 +333,16 @@ public class EventsServiceImpl implements EventsService {
         if (list.isEmpty() && OPENFALSEDATA) {
             logger.info("音频监控------->测试数据");
             int i = (int) (Math.random() * 100);
-            list.add(new EventsAudioMonitor((int) (Math.random() * 50), i + 160, "http://baidu/video/er/h66"));
-            list.add(new EventsAudioMonitor((int) (Math.random() * 50), i + 152, "http://360/video/eefrev/fj=4"));
-            list.add(new EventsAudioMonitor((int) (Math.random() * 50), i + 125, "http://sougou/video/gh/8"));
-            list.add(new EventsAudioMonitor((int) (Math.random() * 50), i + 112, "http://google/video/ert/h686"));
-            list.add(new EventsAudioMonitor((int) (Math.random() * 50), i + 100, "http://haset/video/fd/86"));
-            list.add(new EventsAudioMonitor((int) (Math.random() * 50), i + 57, "http://1234/video/eefv/whbr866"));
-            list.add(new EventsAudioMonitor((int) (Math.random() * 50), i + 23, "http://jindong/videweo/eefwev/86"));
-            list.add(new EventsAudioMonitor((int) (Math.random() * 50), i + 20, "http://taobaoe/video/eeewfv/86"));
-            list.add(new EventsAudioMonitor((int) (Math.random() * 50), i + 11, "http://baidu/video/eefv/56"));
-            list.add(new EventsAudioMonitor((int) (Math.random() * 50), i + 1, "http://goedge/video/eefdv/586"));
+            list.add(new EventsAudioMonitor(""+(int) (Math.random() * 50), i + 160, "http://baidu/video/er/h66"));
+            list.add(new EventsAudioMonitor(""+(int) (Math.random() * 50), i + 152, "http://360/video/eefrev/fj=4"));
+            list.add(new EventsAudioMonitor(""+(int) (Math.random() * 50), i + 125, "http://sougou/video/gh/8"));
+            list.add(new EventsAudioMonitor(""+(int) (Math.random() * 50), i + 112, "http://google/video/ert/h686"));
+            list.add(new EventsAudioMonitor(""+(int) (Math.random() * 50), i + 100, "http://haset/video/fd/86"));
+            list.add(new EventsAudioMonitor(""+(int) (Math.random() * 50), i + 57, "http://1234/video/eefv/whbr866"));
+            list.add(new EventsAudioMonitor(""+(int) (Math.random() * 50), i + 23, "http://jindong/videweo/eefwev/86"));
+            list.add(new EventsAudioMonitor(""+(int) (Math.random() * 50), i + 20, "http://taobaoe/video/eeewfv/86"));
+            list.add(new EventsAudioMonitor(""+(int) (Math.random() * 50), i + 11, "http://baidu/video/eefv/56"));
+            list.add(new EventsAudioMonitor(""+(int) (Math.random() * 50), i + 1, "http://goedge/video/eefdv/586"));
         }
         return list;
     }
@@ -376,16 +376,16 @@ public class EventsServiceImpl implements EventsService {
         if (list.isEmpty() && OPENFALSEDATA) {
             logger.info("视频监控------->测试数据");
             int i = (int) (Math.random() * 100);
-            list.add(new EventsVedioMonitor((int) (Math.random() * 50), i + 320, "http://baidu/video/eefv/h66"));
-            list.add(new EventsVedioMonitor((int) (Math.random() * 50), i + 311, "http://sougou/dig/86/ty"));
-            list.add(new EventsVedioMonitor((int) (Math.random() * 50), i + 258, "http://hashie/y/eeefv/5"));
-            list.add(new EventsVedioMonitor((int) (Math.random() * 50), i + 240, "http://google/r4/e/fe=4"));
-            list.add(new EventsVedioMonitor((int) (Math.random() * 50), i + 121, "http://wiieh440/big/eefv/23df=4"));
-            list.add(new EventsVedioMonitor((int) (Math.random() * 50), i + 100, "http://jdong/date/eefv/h66"));
-            list.add(new EventsVedioMonitor((int) (Math.random() * 50), i + 88, "http://taohjdg/message/eefv/dfyue=56"));
-            list.add(new EventsVedioMonitor((int) (Math.random() * 50), i + 55, "http://360bug/viddeo/eefv/fe=2"));
-            list.add(new EventsVedioMonitor((int) (Math.random() * 50), i + 14, "http://1234/imaged/eefv/iei"));
-            list.add(new EventsVedioMonitor((int) (Math.random() * 50), i + 12, "http://wanguyi/bigdate/eefv/h66"));
+            list.add(new EventsVedioMonitor(""+(int) (Math.random() * 50), i + 320, "http://baidu/video/eefv/h66"));
+            list.add(new EventsVedioMonitor(""+(int) (Math.random() * 50), i + 311, "http://sougou/dig/86/ty"));
+            list.add(new EventsVedioMonitor(""+(int) (Math.random() * 50), i + 258, "http://hashie/y/eeefv/5"));
+            list.add(new EventsVedioMonitor(""+(int) (Math.random() * 50), i + 240, "http://google/r4/e/fe=4"));
+            list.add(new EventsVedioMonitor(""+(int) (Math.random() * 50), i + 121, "http://wiieh440/big/eefv/23df=4"));
+            list.add(new EventsVedioMonitor(""+(int) (Math.random() * 50), i + 100, "http://jdong/date/eefv/h66"));
+            list.add(new EventsVedioMonitor(""+(int) (Math.random() * 50), i + 88, "http://taohjdg/message/eefv/dfyue=56"));
+            list.add(new EventsVedioMonitor(""+(int) (Math.random() * 50), i + 55, "http://360bug/viddeo/eefv/fe=2"));
+            list.add(new EventsVedioMonitor(""+(int) (Math.random() * 50), i + 14, "http://1234/imaged/eefv/iei"));
+            list.add(new EventsVedioMonitor(""+(int) (Math.random() * 50), i + 12, "http://wanguyi/bigdate/eefv/h66"));
         }
         return list;
     }
@@ -419,16 +419,16 @@ public class EventsServiceImpl implements EventsService {
         if (list.isEmpty() && OPENFALSEDATA) {
             logger.info("图片监控------->测试数据");
             int i = (int) (Math.random() * 100);
-            list.add(new EventsImageMonitor((int) (Math.random() * 50), i + 320, "http://baidu/dfedf/h66"));
-            list.add(new EventsImageMonitor((int) (Math.random() * 50), i + 310, "http://souhu/users/sign_in"));
-            list.add(new EventsImageMonitor((int) (Math.random() * 50), i + 300, "http://ttt/users/iamgcom"));
-            list.add(new EventsImageMonitor((int) (Math.random() * 50), i + 258, "http://baidu/diver/iamgem"));
-            list.add(new EventsImageMonitor((int) (Math.random() * 50), i + 213, "http://wangyi/message/iamgoopm"));
-            list.add(new EventsImageMonitor((int) (Math.random() * 50), i + 200, "http://string/usee/iamge.html.m"));
-            list.add(new EventsImageMonitor((int) (Math.random() * 50), i + 189, "http://baidu/dfes/ibhase55m"));
-            list.add(new EventsImageMonitor((int) (Math.random() * 50), i + 158, "http://baidu/usefreers/iamg5m"));
-            list.add(new EventsImageMonitor((int) (Math.random() * 50), i + 120, "http://souhu/usersef/ieamge7"));
-            list.add(new EventsImageMonitor((int) (Math.random() * 50), i + 100, "http://sougoole/useeers/iamgeui"));
+            list.add(new EventsImageMonitor(""+(int) (Math.random() * 50), i + 320, "http://baidu/dfedf/h66"));
+            list.add(new EventsImageMonitor(""+(int) (Math.random() * 50), i + 310, "http://souhu/users/sign_in"));
+            list.add(new EventsImageMonitor(""+(int) (Math.random() * 50), i + 300, "http://ttt/users/iamgcom"));
+            list.add(new EventsImageMonitor(""+(int) (Math.random() * 50), i + 258, "http://baidu/diver/iamgem"));
+            list.add(new EventsImageMonitor(""+(int) (Math.random() * 50), i + 213, "http://wangyi/message/iamgoopm"));
+            list.add(new EventsImageMonitor(""+(int) (Math.random() * 50), i + 200, "http://string/usee/iamge.html.m"));
+            list.add(new EventsImageMonitor(""+(int) (Math.random() * 50), i + 189, "http://baidu/dfes/ibhase55m"));
+            list.add(new EventsImageMonitor(""+(int) (Math.random() * 50), i + 158, "http://baidu/usefreers/iamg5m"));
+            list.add(new EventsImageMonitor(""+(int) (Math.random() * 50), i + 120, "http://souhu/usersef/ieamge7"));
+            list.add(new EventsImageMonitor(""+(int) (Math.random() * 50), i + 100, "http://sougoole/useeers/iamgeui"));
         }
         return list;
     }
@@ -462,16 +462,16 @@ public class EventsServiceImpl implements EventsService {
         if (list.isEmpty() && OPENFALSEDATA) {
             logger.info("VOIP监控------->测试数据");
             int i = (int) (Math.random() * 100);
-            list.add(new EventsVoipMonitor((int) (Math.random() * 10000) + 1982345254, i + 560, "http://baidu/iphi/picture/grennd/efd=3"));
-            list.add(new EventsVoipMonitor((int) (Math.random() * 10000) + 1760145025, i + 230, "http://sougoole/news/vedio/id=3"));
-            list.add(new EventsVoipMonitor((int) (Math.random() * 10000) + 1655693574, i + 200, "http://firfox/videi/secondes/efd?"));
-            list.add(new EventsVoipMonitor((int) (Math.random() * 10000) + 1266548966, i + 123, "http://google/ladid/big/dateid=r3r5"));
-            list.add(new EventsVoipMonitor((int) (Math.random() * 10000) + 1813676445, i + 58, "http://safait/ioite/gie/egter3"));
-            list.add(new EventsVoipMonitor((int) (Math.random() * 10000) + 1502897475, i + 22, "http://few/Sptinhgboot/mage/efd=3"));
-            list.add(new EventsVoipMonitor((int) (Math.random() * 10000) + 1256733494, i + 11, "http://baidu/news/message/efd?e=e"));
-            list.add(new EventsVoipMonitor((int) (Math.random() * 10000) + 1887465275, i + 3, "http://souhu/jdong/picture/cart=45"));
-            list.add(new EventsVoipMonitor((int) (Math.random() * 10000) + 1876117576, i + 2, "http://taobao/item/job/efe3"));
-            list.add(new EventsVoipMonitor((int) (Math.random() * 10000) + 1760145025, i + 1, "http://baidu/timenews/sege/edfe=t5"));
+            list.add(new EventsVoipMonitor(""+(int) (Math.random() * 10000) + 1982345254, i + 560, "http://baidu/iphi/picture/grennd/efd=3"));
+            list.add(new EventsVoipMonitor(""+(int) (Math.random() * 10000) + 1760145025, i + 230, "http://sougoole/news/vedio/id=3"));
+            list.add(new EventsVoipMonitor(""+(int) (Math.random() * 10000) + 1655693574, i + 200, "http://firfox/videi/secondes/efd?"));
+            list.add(new EventsVoipMonitor(""+(int) (Math.random() * 10000) + 1266548966, i + 123, "http://google/ladid/big/dateid=r3r5"));
+            list.add(new EventsVoipMonitor(""+(int) (Math.random() * 10000) + 1813676445, i + 58, "http://safait/ioite/gie/egter3"));
+            list.add(new EventsVoipMonitor(""+(int) (Math.random() * 10000) + 1502897475, i + 22, "http://few/Sptinhgboot/mage/efd=3"));
+            list.add(new EventsVoipMonitor(""+(int) (Math.random() * 10000) + 1256733494, i + 11, "http://baidu/news/message/efd?e=e"));
+            list.add(new EventsVoipMonitor(""+(int) (Math.random() * 10000) + 1887465275, i + 3, "http://souhu/jdong/picture/cart=45"));
+            list.add(new EventsVoipMonitor(""+(int) (Math.random() * 10000) + 1876117576, i + 2, "http://taobao/item/job/efe3"));
+            list.add(new EventsVoipMonitor(""+(int) (Math.random() * 10000) + 1760145025, i + 1, "http://baidu/timenews/sege/edfe=t5"));
         }
         return list;
     }
diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html
index 3587c20..129850f 100644
--- a/src/main/resources/static/index.html
+++ b/src/main/resources/static/index.html
@@ -20,8 +20,5 @@
         <input type="submit" value="上传" style="width: 50px;height: 25px"/>
     </h3><br>
 </form>
-<form action="/allImageData" method="get">
-    <input type="submit" value="查询所有" style="width: 100px;height: 25px">
-</form>
 </body>
 </html>
\ No newline at end of file