mm多媒体推送 提前1小时，因报表为1小时统计一次

2 files changed, 14 insertions, 9 deletions

diff --git a/src/main/java/com/nis/galaxy/template/ForEventsInterface.java b/src/main/java/com/nis/galaxy/template/ForEventsInterface.java
index 0fbb871..1c841d7 100644
--- a/src/main/java/com/nis/galaxy/template/ForEventsInterface.java
+++ b/src/main/java/com/nis/galaxy/template/ForEventsInterface.java
@@ -333,7 +333,7 @@ public class ForEventsInterface {
     }
 
     /**
-     * 音频监控 1小时送一次数据
+     * 音频监控 1小时送一次数据;原始数据
      */
     @Scheduled(cron = "${1h.scheduled.cron.plan}")
     @SchedulerLock(name = "audio.monitor", lockAtLeastForString = "PT20M", lockAtMostForString = "PT40M")
@@ -342,8 +342,9 @@ public class ForEventsInterface {
             return;
         }
         String logMark = "音频监控";
-        Date end = DateUtil.getFormatHour(new Date());
-        Date start = DateUtil.getSomeHour(end, -1);
+        Date date = DateUtil.getFormatHour(new Date());
+        Date end = DateUtil.getSomeHour(date, -1);
+        Date start  = DateUtil.getSomeHour(end, -2);
         List contentValue = null;
         try {
             contentValue = eventsService.getEventsAudioMonitor(start, end, logMark);
@@ -371,8 +372,9 @@ public class ForEventsInterface {
             return;
         }
         String logMark = "视频监控";
-        Date end = DateUtil.getFormatHour(new Date());
-        Date start = DateUtil.getSomeHour(end, -1);
+        Date date = DateUtil.getFormatHour(new Date());
+        Date end = DateUtil.getSomeHour(date, -1);
+        Date start  = DateUtil.getSomeHour(end, -2);
         List contentValue = null;
         try {
             contentValue = eventsService.getVedioMonitor(start, end, logMark);
@@ -400,8 +402,9 @@ public class ForEventsInterface {
             return;
         }
         String logMark = "图片监控";
-        Date end = DateUtil.getFormatHour(new Date());
-        Date start = DateUtil.getSomeHour(end, -1);
+        Date date = DateUtil.getFormatHour(new Date());
+        Date end = DateUtil.getSomeHour(date, -1);
+        Date start  = DateUtil.getSomeHour(end, -2);
         List contentValue = null;
         try {
             contentValue = eventsService.getImageMonitor(start, end, logMark);
@@ -429,8 +432,9 @@ public class ForEventsInterface {
             return;
         }
         String logMark = "VOIP监控";
-        Date end = DateUtil.getFormatHour(new Date());
-        Date start = DateUtil.getSomeHour(end, -1);
+        Date date = DateUtil.getFormatHour(new Date());
+        Date end = DateUtil.getSomeHour(date, -1);
+        Date start  = DateUtil.getSomeHour(end, -2);
         List contentValue = null;
         try {
             contentValue = eventsService.getVoipMonitor(start, end, 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 e60196b..271a854 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
@@ -482,6 +482,7 @@ public class EventsServiceImpl implements EventsService {
         long timeMillisStart = System.currentTimeMillis();
         try {
             list = eventsDao.getEventsAudioMonitor(start, start, end);
+
         } catch (Exception e) {
             logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }