style(整理代码)：删除废弃代码

6 files changed, 10 insertions, 314 deletions

diff --git a/src/main/java/com/nis/galaxy/template/ForBlockingTopNInterface.java b/src/main/java/com/nis/galaxy/template/ForBlockingTopNInterface.java
index 7d21914..5df61e3 100644
--- a/src/main/java/com/nis/galaxy/template/ForBlockingTopNInterface.java
+++ b/src/main/java/com/nis/galaxy/template/ForBlockingTopNInterface.java
@@ -82,7 +82,7 @@ public class ForBlockingTopNInterface {
         }
         String logMark = "1小时内全国阻断URLTOP10";
         Date end = DateUtil.getFormatHour(new Date());
-        Date start = DateUtil.getSomeDate(end, -1);
+        Date start = DateUtil.getSomeHour(end, -1);
         List contentValue = null;
         try {
             //获取并封装数据
@@ -111,7 +111,7 @@ public class ForBlockingTopNInterface {
         }
         String logMark = "1小时内全国阻断URLTOP10";
         Date end = DateUtil.getFormatHour(new Date());
-        Date start = DateUtil.getSomeDate(end, -1);
+        Date start = DateUtil.getSomeHour(end, -1);
         List contentValue = null;
         try {
             //获取并封装推送数据
@@ -232,8 +232,8 @@ public class ForBlockingTopNInterface {
 //        getAreaBlockTop10ProtocolOf24h();//
 //        getBlockTop10URLOf1h();//
 //        getBlockTop10WebsiteOf1h();//
-//        getBlockTop10URLOf5m();//
-//        getBlockTop10WebsiteOf5m();//
+        getBlockTop10URLOf5m();
+        getBlockTop10WebsiteOf5m();
 //        getBlockTop100Tag1h();//
     }
 }
diff --git a/src/main/java/com/nis/galaxy/template/ForEventsInterface.java b/src/main/java/com/nis/galaxy/template/ForEventsInterface.java
index 44900a4..89718e9 100644
--- a/src/main/java/com/nis/galaxy/template/ForEventsInterface.java
+++ b/src/main/java/com/nis/galaxy/template/ForEventsInterface.java
@@ -228,7 +228,7 @@ public class ForEventsInterface {
         Date start = DateUtil.getSomeHour(end, -1);
         List contentValue = null;
         try {
-            contentValue = eventsService.getCfgsMonitor(start,end,logMark);
+            contentValue = eventsService.getCfgsMonitor(start, end, logMark);
 
         } catch (Exception e) {
             logger.error(logMark + "\t查询异常\trestTemplate", e);
@@ -244,40 +244,6 @@ public class ForEventsInterface {
         logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
-
-    /**
-     * 事件监测 1小时送一次数据
-     */
-    //@Scheduled(cron = "${1h.scheduled.cron.plan}")
-    //@SchedulerLock(name = "events.monitor", lockAtLeastForString = "PT20M", lockAtMostForString = "PT40M")
-    public void getEventsMonitor_tmp() {
-        if (!Boolean.parseBoolean(scheduledEventsEnable)) {
-            return;
-        }
-        String logMark = "事件监测";
-        List contentValue = null;
-        try {
-            contentValue = eventsService.getEventsMonitor(logMark);
-
-        } catch (Exception e) {
-            logger.error(logMark + "\t查询异常\trestTemplate", e);
-        }
-        if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn(logMark + "\t无数据\t取消本次推送");
-            return;
-        }
-        // 请求头和请求体
-        HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "events.monitor", contentValue);
-        logger.info("开始推送=======>>{}\t请求头和请求体\t{}", logMark, httpEntity);
-        ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_EVENTS, httpEntity);
-        logger.info("{}\t推送返回结果\t{}", logMark, response);
-    }
-
-
-
-
-
-
     /**
      * 事件封堵 1小时送一次数据
      */
@@ -292,36 +258,7 @@ public class ForEventsInterface {
         Date start = DateUtil.getSomeHour(end, -1);
         List contentValue = null;
         try {
-            contentValue = eventsService.getCfgsBlock(start,end,logMark);
-        } catch (Exception e) {
-            logger.error(logMark + "\t查询异常\trestTemplate", e);
-        }
-        if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn(logMark + "\t无数据\t取消本次推送");
-            return;
-        }
-        // 请求头和请求体
-        HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "events.block", contentValue);
-        logger.info("开始推送=======>>{}\t请求头和请求体\t{}", logMark, httpEntity);
-        ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_EVENTS, httpEntity);
-        logger.info("{}\t推送返回结果\t{}", logMark, response);
-    }
-
-
-
-    /**
-     * 事件封堵 1小时送一次数据
-     */
-   // @Scheduled(cron = "${1h.scheduled.cron.plan}")
-   // @SchedulerLock(name = "events.block", lockAtLeastForString = "PT20M", lockAtMostForString = "PT40M")
-    public void getEventsBlock_tmp() {
-        if (!Boolean.parseBoolean(scheduledEventsEnable)) {
-            return;
-        }
-        String logMark = "事件封堵";
-        List contentValue = null;
-        try {
-            contentValue = eventsService.getEventsBlock(logMark);
+            contentValue = eventsService.getCfgsBlock(start, end, logMark);
         } catch (Exception e) {
             logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
@@ -348,7 +285,7 @@ public class ForEventsInterface {
         String logMark = "音频监控";
         Date date = DateUtil.getFormatHour(new Date());
         Date end = DateUtil.getSomeHour(date, -1);
-        Date start  = DateUtil.getSomeHour(end, -2);
+        Date start = DateUtil.getSomeHour(end, -2);
         List contentValue = null;
         try {
             contentValue = eventsService.getEventsAudioMonitor(start, end, logMark);
@@ -378,7 +315,7 @@ public class ForEventsInterface {
         String logMark = "视频监控";
         Date date = DateUtil.getFormatHour(new Date());
         Date end = DateUtil.getSomeHour(date, -1);
-        Date start  = DateUtil.getSomeHour(end, -2);
+        Date start = DateUtil.getSomeHour(end, -2);
         List contentValue = null;
         try {
             contentValue = eventsService.getVedioMonitor(start, end, logMark);
@@ -408,7 +345,7 @@ public class ForEventsInterface {
         String logMark = "图片监控";
         Date date = DateUtil.getFormatHour(new Date());
         Date end = DateUtil.getSomeHour(date, -1);
-        Date start  = DateUtil.getSomeHour(end, -2);
+        Date start = DateUtil.getSomeHour(end, -2);
         List contentValue = null;
         try {
             contentValue = eventsService.getImageMonitor(start, end, logMark);
@@ -438,7 +375,7 @@ public class ForEventsInterface {
         String logMark = "VOIP监控";
         Date date = DateUtil.getFormatHour(new Date());
         Date end = DateUtil.getSomeHour(date, -1);
-        Date start  = DateUtil.getSomeHour(end, -2);
+        Date start = DateUtil.getSomeHour(end, -2);
         List contentValue = null;
         try {
             contentValue = eventsService.getVoipMonitor(start, end, logMark);
@@ -720,36 +657,6 @@ public class ForEventsInterface {
         logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
-    /**
-     * 端口信息
-     */
-//    @Scheduled(cron = "${1h.scheduled.cron.plan}")
-//    @SchedulerLock(name = "port.info", lockAtLeastForString = "PT20M", lockAtMostForString = "PT40M")
-    public void getPortInfo() {
-        if (!Boolean.parseBoolean(scheduledEventsEnable)) {
-            return;
-        }
-        String logMark = "端口信息";
-        Date end = DateUtil.getFormatHour(new Date());
-        Date start = DateUtil.getSomeHour(end, -1);
-        List contentValue = null;
-        try {
-            contentValue = eventsService.getPortInfo(start, end, logMark);
-        } catch (Exception e) {
-            logger.error(logMark + "\t查询异常\trestTemplate", e);
-        }
-        if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn(logMark + "\t无数据\t取消本次推送");
-            return;
-        }
-        // 请求头和请求体
-        HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "ip.block", contentValue);
-        logger.info("开始推送=======>>{}请求头和请求体\t{}", logMark, httpEntity);
-        ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_EVENTS, httpEntity);
-        logger.info("{}\t推送返回结果\t{}", logMark, response);
-    }
-
-
     @Scheduled(fixedRate = 999999999)
     @SchedulerLock(name = "FirstPushEvents", lockAtLeastForString = "PT1H", lockAtMostForString = "PT2H")
     public void run() throws InterruptedException {
@@ -778,6 +685,5 @@ public class ForEventsInterface {
         getSpecificAppBlock();
         getHttpBlock();
         getIpBlock();
-//        getPortInfo();//
     }
 }
diff --git a/src/main/java/com/nis/galaxy/web/dao/EventsDao.java b/src/main/java/com/nis/galaxy/web/dao/EventsDao.java
index 14d31ac..fe04d3b 100644
--- a/src/main/java/com/nis/galaxy/web/dao/EventsDao.java
+++ b/src/main/java/com/nis/galaxy/web/dao/EventsDao.java
@@ -49,13 +49,8 @@ public interface EventsDao {
 
     Date getRunningStateLastTime(@Param("end") Date end);
 
-    List<EventsMonitor> getEventsMonitor();
-
     List<EventsMonitor> getCfgsMonitor(@Param("start") Date start, @Param("end") Date end);
 
-
-    List<EventsBlock> getEventsBlock();
-
     List<EventsBlock> getCfgsBlock(@Param("start") Date start, @Param("end") Date end);
 
     List<EvevtsTargetNetwork> getTargetNetwork(@Param("push") Date push, @Param("start") Date start, @Param("end") Date end);
@@ -72,8 +67,6 @@ public interface EventsDao {
 
     List<EventsPortInfo> getPortInfo(@Param("push") Date push, @Param("start") Date start, @Param("end") Date end);
 
-    Date getPortInfoLastTime(@Param("end") Date end);
-
     List<EventsSpecificWebsites> getFocusWebsite(@Param("push") Date push, @Param("start") Date start, @Param("end") Date end);
 
     Date getFocusWebsiteLastTime(@Param("end") Date end);
diff --git a/src/main/java/com/nis/galaxy/web/service/EventsService.java b/src/main/java/com/nis/galaxy/web/service/EventsService.java
index f252c60..e239069 100644
--- a/src/main/java/com/nis/galaxy/web/service/EventsService.java
+++ b/src/main/java/com/nis/galaxy/web/service/EventsService.java
@@ -71,15 +71,6 @@ public interface EventsService {
      */
     List<EventsSpecificWebsites> getFocusWebsite(Date start, Date end, String logMark);
 
-
-    /**
-     * 事件监测
-     *
-     * @param logMark
-     * @return
-     */
-    List<EventsMonitor> getEventsMonitor(String logMark);
-
     /**
      * 当前生效配置监测日志量
      *
@@ -91,15 +82,6 @@ public interface EventsService {
     List<EventsMonitor> getCfgsMonitor(Date start, Date end, String logMark);
 
     /**
-     * 事件封堵
-     *
-     * @param logMark
-     * @return
-     */
-    List<EventsBlock> getEventsBlock(String logMark);
-
-
-    /**
      * 当前生效配置阻断日志量
      *
      * @param start
@@ -191,12 +173,4 @@ public interface EventsService {
      */
     List<EventsNameNumTime> getTypeMonitorReject(Date start, Date end, String type);
 
-    /**
-     * 端口信息
-     *
-     * @param start
-     * @param end
-     * @return
-     */
-    List<EventsPortInfo> getPortInfo(Date start, Date end, String logMark);
 }
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 f479c00..faacf6c 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
@@ -335,38 +335,6 @@ public class EventsServiceImpl implements EventsService {
         return list;
     }
 
-    /**
-     * 事件监测
-     *
-     * @param logMark
-     * @return
-     */
-    @Override
-    public List<EventsMonitor> getEventsMonitor(String logMark) {
-        List<EventsMonitor> list = new ArrayList<>();
-        long timeMillisStart = System.currentTimeMillis();
-        try {
-            list = eventsDao.getEventsMonitor();
-        } catch (Exception e) {
-            logger.error(logMark + "\t查询异常\tserviceImpl", e);
-        }
-        logger.info("{}耗时\t{}", logMark, (System.currentTimeMillis() - timeMillisStart));
-        if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
-            logger.info(logMark + "------->测试数据");
-            Date taskTimeTemp = DateUtil.getFormatHour(new Date());
-            java.sql.Date taskTime = new java.sql.Date(taskTimeTemp.getTime());
-            list.add(new EventsMonitor("double agent", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), taskTime));
-            list.add(new EventsMonitor("nuclear program", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), taskTime));
-            list.add(new EventsMonitor("Subject Tests", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), taskTime));
-            list.add(new EventsMonitor("fake task", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), taskTime));
-            list.add(new EventsMonitor("savage", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), taskTime));
-            list.add(new EventsMonitor("satellite", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), taskTime));
-            list.add(new EventsMonitor("taskName", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), taskTime));
-        }
-        return list;
-    }
-
-
     @Override
     public List<EventsMonitor> getCfgsMonitor(Date start, Date end, String logMark) {
         List<EventsMonitor> list = new ArrayList<>();
@@ -423,39 +391,6 @@ public class EventsServiceImpl implements EventsService {
         return list;
     }
 
-
-    /**
-     * 事件封堵
-     *
-     * @param logMark
-     * @return
-     */
-    @Override
-    public List<EventsBlock> getEventsBlock(String logMark) {
-        List<EventsBlock> list = new ArrayList<>();
-        long timeMillisStart = System.currentTimeMillis();
-        try {
-            list = eventsDao.getEventsBlock();
-        } catch (Exception e) {
-            logger.error(logMark + "\t查询异常\tserviceImpl", e);
-        }
-        logger.info("{}耗时\t{}", logMark, (System.currentTimeMillis() - timeMillisStart));
-        if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
-            logger.info(logMark + "------->测试数据");
-            Date taskTimeTemp = DateUtil.getFormatHour(new Date());
-            java.sql.Date taskTime = new java.sql.Date(taskTimeTemp.getTime());
-            list.add(new EventsBlock("spy", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), taskTime));
-            list.add(new EventsBlock("test", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), taskTime));
-            list.add(new EventsBlock("second task", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), taskTime));
-            list.add(new EventsBlock("Two Sessions", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), taskTime));
-            list.add(new EventsBlock("taskName", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), taskTime));
-            list.add(new EventsBlock("ACTIVATING EVENT", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), taskTime));
-            list.add(new EventsBlock("Meeting event", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), taskTime));
-        }
-        return list;
-    }
-
-
     /**
      * 音频监控
      *
@@ -879,44 +814,4 @@ public class EventsServiceImpl implements EventsService {
         }
         return list;
     }
-
-    /**
-     * 端口信息
-     *
-     * @param start
-     * @param end
-     * @return
-     */
-    @Override
-    public List<EventsPortInfo> getPortInfo(Date start, Date end, String logMark) {
-        long timeMillisStart = System.currentTimeMillis();
-        List<EventsPortInfo> list = new ArrayList<>();
-        try {
-            list = eventsDao.getPortInfo(start, start, end);
-        } catch (Exception e) {
-            logger.error(logMark + "\t查询异常\tserviceImpl", e);
-        }
-        if (ListUtils.isEmptyList(list) && ConfigUtil.recentData) {
-            logger.warn("{}\t********\t{}至{}\t期间无数据\t查询最近数据", logMark, start, end);
-            try {
-                Date startLastTime = eventsDao.getPortInfoLastTime(end);
-                if (startLastTime != null) {
-                    startLastTime = DateUtil.getFormatHour(startLastTime);
-                    Date endLastTime = DateUtil.getSomeHour(startLastTime, 1);
-                    list = eventsDao.getPortInfo(start, startLastTime, endLastTime);
-                } else {
-                    logger.warn(logMark + "\t*********\t无数据");
-                }
-            } catch (Exception e) {
-                logger.error(logMark + "\t最近数据\t查询异常\tserviceImpl", e);
-            }
-        }
-        logger.info("{}耗时\t{}", logMark, (System.currentTimeMillis() - timeMillisStart));
-        if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
-            logger.info("端口信息------->测试数据");
-            list = new ArrayList<>();
-            list.add(new EventsPortInfo(start, "", "", "", ""));
-        }
-        return list;
-    }
 }
diff --git a/src/main/resources/mybatis/mapper/EventsMapper.xml b/src/main/resources/mybatis/mapper/EventsMapper.xml
index caad872..a74783a 100644
--- a/src/main/resources/mybatis/mapper/EventsMapper.xml
+++ b/src/main/resources/mybatis/mapper/EventsMapper.xml
@@ -212,36 +212,6 @@
         LIMIT 100;
      ]]>
     </select>
-   <!--事件监测-->
-    <select id="getEventsMonitor" resultType="com.nis.galaxy.domain.EventsMonitor">
-      SELECT task.audit_time time, task.task_name event,
-             sum(case t.service_id when 128 then t.sum else 0 end) as ipNum ,
-			 sum(case t.service_id when 129 then t.sum else 0 end) as httpNum ,
-			 sum(case t.service_id when 132 then t.sum else 0 end) as mailNum ,
-			 sum(case t.service_id when 390 then t.sum else 0 end) as vedioNum ,
-			 sum(case t.service_id when 592 then t.sum else 0 end) as agentNum
-       FROM (select * from ui_task_info where is_valid=1) task
-       LEFT JOIN (select * from ui_request_info  where is_valid=1) lwhh
-       ON task.id = lwhh.task_id
-       LEFT JOIN (SELECT r.request_id,r.service_id,COALESCE(SUM(t.sum),0) AS sum
-                   FROM
-                   ( SELECT t.request_id, t.service_id, t.compile_id
-                     FROM ui_request_num_statistics t
-                     GROUP BY t.request_id, t.service_id, t.compile_id
-                    ) r ,
-                    ( SELECT cfg_id, service, sum(sum) AS sum
-                      FROM ntc_pz_report
-                      WHERE service IN (128, 129, 132, 390, 592)
-                      GROUP BY service, cfg_id )t
-                   WHERE t.cfg_id = r.compile_id
-                   GROUP BY r.request_id,r.service_id
-                   ) t
-       ON t.request_id=lwhh.id
-       GROUP BY  event,time
-       HAVING (ipNum+httpNum+mailNum+vedioNum+agentNum)>0;
-    </select>
-
-
 
     <select id="getCfgsMonitor" resultType="com.nis.galaxy.domain.EventsMonitor">
         <![CDATA[
@@ -261,47 +231,10 @@
 												service_id in (128, 129, 131, 132, 389, 390, 391, 392, 592)
 											)
 				      GROUP BY service	) t
-
 			 GROUP BY event
         ]]>
     </select>
 
-
-    <!--事件封堵-->
-    <select id="getEventsBlock" resultType="com.nis.galaxy.domain.EventsBlock">
-    SELECT  task.audit_time time, task.task_name event,
-        sum(case t.service_id when 16 then t.sum else 0 end) as ipNum ,
-		sum(case t.service_id when 17 then t.sum else 0 end) as httpNum ,
-		sum(case t.service_id when 20 then t.sum else 0 end) as mailNum ,
-		sum(case t.service_id when 262 then t.sum else 0 end) as vedioNum ,
-		sum(case t.service_id when 576 then t.sum else 0 end) as agentNum
-    FROM (select *
-          from ui_task_info
-    			where is_valid=1) task
-    LEFT JOIN
-    			(select *
-          from ui_request_info
-    			where is_valid=1) lwhh
-    ON task.id = lwhh.task_id
-    LEFT JOIN
-           (SELECT r.request_id,r.service_id,COALESCE(SUM(t.sum),0) sum
-    			  FROM ( SELECT  t.request_id, t.service_id, t.compile_id
-    							 FROM ui_request_num_statistics t
-    							 GROUP BY t.request_id, t.service_id, t.compile_id ) r ,
-    						 ( SELECT cfg_id, service, sum(sum) sum
-    						   FROM ntc_pz_report
-    							 WHERE service IN (16, 17, 20, 262, 576)
-    							 GROUP BY service, cfg_id ) t
-    				WHERE t.cfg_id = r.compile_id
-    				GROUP BY r.request_id,r.service_id) t
-    ON t.request_id=lwhh.id
-    GROUP BY  event,time
-    HAVING (ipNum+httpNum+mailNum+vedioNum+agentNum)>0;
-    </select>
-
-
-
-
     <select id="getCfgsBlock" resultType="com.nis.galaxy.domain.EventsBlock">
        <![CDATA[
        SELECT #{start} as time, 'cfgblock' as  event,
@@ -463,8 +396,6 @@
         ]]>
     </select>
 
-
-
     <select id="getFocusWebsiteLastTime" resultType="java.util.Date">
         <![CDATA[
         SELECT stat_time
@@ -474,7 +405,4 @@
         LIMIT 1
         ]]>
     </select>
-    <!--时间：端口信息-->
-    <select id="getPortInfoLastTime" resultType="java.util.Date">
-    </select>
 </mapper>
\ No newline at end of file