修改事件封堵、监测查询时间为：当天时间0点 至 最新时间

3 files changed, 17 insertions, 10 deletions

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 7275657..ec27fdc 100644
--- a/src/main/java/com/nis/galaxy/web/dao/EventsDao.java
+++ b/src/main/java/com/nis/galaxy/web/dao/EventsDao.java
@@ -51,12 +51,12 @@ public interface EventsDao {
 
     List<EventsMonitor> getEventsMonitor();
 
-    List<EventsMonitor> getCfgsMonitor();
+    List<EventsMonitor> getCfgsMonitor(@Param("start") Date push);
 
 
     List<EventsBlock> getEventsBlock();
 
-    List<EventsBlock> getCfgsBlock();
+    List<EventsBlock> getCfgsBlock(@Param("start") Date push);
 
     List<EvevtsTargetNetwork> getTargetNetwork(@Param("push") Date push, @Param("start") Date start, @Param("end") Date end);
 
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 b26822d..e60196b 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
@@ -382,7 +382,8 @@ public class EventsServiceImpl implements EventsService {
         List<EventsMonitor> list = new ArrayList<>();
         long timeMillisStart = System.currentTimeMillis();
         try {
-            list = eventsDao.getCfgsMonitor();
+            Date start = DateUtil.getFormatDay(new Date());
+            list = eventsDao.getCfgsMonitor(start);
         } catch (Exception e) {
             logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
@@ -413,7 +414,8 @@ public class EventsServiceImpl implements EventsService {
         List<EventsBlock> list = new ArrayList<>();
         long timeMillisStart = System.currentTimeMillis();
         try {
-            list = eventsDao.getCfgsBlock();
+            Date start = DateUtil.getFormatDay(new Date());
+            list = eventsDao.getCfgsBlock(start);
         } catch (Exception e) {
             logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
diff --git a/src/main/resources/mybatis/mapper/EventsMapper.xml b/src/main/resources/mybatis/mapper/EventsMapper.xml
index 2c73202..569a159 100644
--- a/src/main/resources/mybatis/mapper/EventsMapper.xml
+++ b/src/main/resources/mybatis/mapper/EventsMapper.xml
@@ -244,7 +244,7 @@
 
 
     <select id="getCfgsMonitor" resultType="com.nis.galaxy.domain.EventsMonitor">
-
+        <![CDATA[
         SELECT now() as time, 'cfgmonitor' as  event,
              sum(case t.service when 128 then t.sum else 0 end) as ipNum ,
 			 sum(case t.service when 129 then t.sum else 0 end) as httpNum ,
@@ -254,14 +254,16 @@
 			 from (
 		              SELECT  service, sum(sum) AS sum
                         FROM ntc_pz_report
-                        WHERE cfg_id in (
+                        WHERE report_time >= #{start}
+                        AND report_time < now()
+                        AND cfg_id in (
 											select compile_id from ui_cfg_num_statistics  where cfg_state=1 and
 												service_id in (128, 129, 132, 389, 390, 391, 392, 592)
 											)
 				      GROUP BY service	) t
-			 GROUP BY event
-
 
+			 GROUP BY event
+        ]]>
     </select>
 
 
@@ -301,6 +303,7 @@
 
 
     <select id="getCfgsBlock" resultType="com.nis.galaxy.domain.EventsBlock">
+       <![CDATA[
        SELECT now() as time, 'cfgblock' as  event,
              sum(case t.service when 16 then t.sum else 0 end) as ipNum ,
 			 sum(case t.service when 17 then t.sum else 0 end) as httpNum ,
@@ -310,14 +313,16 @@
 			 from (
 		              SELECT  service, sum(sum) AS sum
                         FROM ntc_pz_report
-                        WHERE cfg_id in (
+                        WHERE report_time >= #{start}
+                        AND report_time < now()
+                        AND cfg_id in (
 											select compile_id from ui_cfg_num_statistics  where cfg_state=1 and
 												service_id in (16, 17, 20, 261, 262, 263, 264,576)
 											)
 				      GROUP BY service	) t
 
 			 GROUP BY event;
-
+       ]]>
     </select>
 
     <select id="getHttpsMonitor" resultType="com.nis.galaxy.domain.EventsNameNumTime">