chore: [merger] 修改事件获取的起止时间

isc_video_record/merger.py

@@ -48,16 +48,23 @@ class EventMergerJob:
         last_check_time = pipe.get(last_check_time_key)
         if not last_check_time:
             # 设备无上次事件,取最近的15分钟作为开始时间
-            last_check_time = now - timedelta(minutes=15)
+            last_check_time = now - timedelta(hours=2)
+            pipe.set(last_check_time_key, last_check_time.strftime('%Y-%m-%d %H:%M:%S'))
         else:
             last_check_time = datetime.strptime(
                 last_check_time, '%Y-%m-%d %H:%M:%S')
-            # 调整最大事件长度为1天
+
+            if now - last_check_time > timedelta(days=7):
+                # 设备一直离线超过七天则放弃七天以前的数据
+                last_check_time = now - timedelta(days=7)
             if now - last_check_time > timedelta(days=1):
+                # 时间跨度超过一天，则分割成两个小时
                 now = last_check_time + timedelta(hours=2)
 
         events = []
         try:
+            log.info('查询摄像头%s在%s,%s的本地视频文件', camera['device_code'],
+                     last_check_time, now)
             events = api_helper.get_cameras_playback_urls(
                 camera['device_code'],
                 IntelabApiHelper.iso_format(last_check_time.astimezone(tz)),
@@ -163,6 +170,8 @@ class EventMergerJob:
                 log.exception(e)
                 send_alarm_to_developer('isc-merger', e)
 
+            log.info('=====================')
+
         pipe.close()
 
         try: