fix: [merger] 修复merger时区问题

isc_video_record/merger.py

@@ -170,8 +170,8 @@ class EventMergerJob:
         """
         events = api_helper.get_cameras_playback_urls(
             camera['device_code'],
-            IntelabApiHelper.iso_format(last_check_time),
-            IntelabApiHelper.iso_format(now))
+            IntelabApiHelper.iso_format(last_check_time.astimezone(tz)),
+            IntelabApiHelper.iso_format(now.astimezone(tz)))
         return events
 
     def get_new_events(self, last_check_time, now, camera):
@@ -245,7 +245,7 @@ class EventMergerJob:
 
             except Exception as e:
                 log.exception(e)
-                send_alarm_to_developer(e)
+                send_alarm_to_developer('isc-merger', e)
 
         pipe.close()
 

isc_video_record/utils/api_helper.py

@@ -45,11 +45,10 @@ class IntelabApiHelper:
 
         for pre_event in pre_events[1:]:
             # 合并时间间隔较短的事件
-            last_end_time = events[-1]['end_time']
-            start_time = dateutil.parser.parse(pre_events['beginTime'])
-            end_time = dateutil.parser.parse(pre_events['endTime'])
+            start_time = dateutil.parser.parse(pre_event['beginTime'])
+            end_time = dateutil.parser.parse(pre_event['endTime'])
 
-            if start_time - last_end_time <= timedelta(seconds=2):
+            if start_time - events[-1]['end_time'] <= timedelta(seconds=2):
                 events[-1]['end_time'] = end_time
             else:
                 events.append({

setup.py

@@ -23,7 +23,7 @@ requires = [
 
 setuptools.setup(
     name='isc-video-record',
-    version='1.0.0a17',
+    version='1.0.0a18',
     description='ISC motion detection playback video stream recording service.',
     long_description=long_description,
     long_description_content_type='text/markdown',