fix: 修复时区等问题，标记录制失败的视频

isc_video_record/db/mysql.py

@@ -89,7 +89,7 @@ def get_camera_info(cursor, conn):
         from camera_info
         join camera_ai_config cac
             on camera_info.id = cac.camera_info_id
-        where biz_type is not null
+        where biz_type is not null and is_valid = 1
         order by create_time;
     '''
     cursor.execute(sql)
@@ -146,7 +146,7 @@ def update_video_info(cursor, conn, db_table, video_id, status,
 @query(cursor_dict=True)
 def get_untreated_events(cursor, conn, db_table, camera_code, status=3):
     sql = '''
-        select 
+        select
             id as video_id,
             device_code as camera_code,
             start_time, end_time, status

isc_video_record/merger.py

@@ -105,7 +105,7 @@ class EventMergerJob:
                     'camera_code': camera['device_code'],
                     'camera_index': camera['point_index_code'],
                     'db_table': camera['db_table'],
-                    'event_duration': event_duration + 10
+                    'ex': event_duration + 10
                 }
                 if len(events) > 0:
                     self.send_mq_message(body)

isc_video_record/recorder.py

@@ -125,7 +125,12 @@ class StreamRecorder:
     def recording(self, thread_id, db_table, event):
 
         t1 = time.time()
-        record_result = self.recorder(event['camera_code'], event['start_time'], event['end_time'], thread_id)
+        record_result = self.recorder(
+            event['camera_code'],
+            event['start_time'].astimezone(tz),  # 录制调用接口的过程中使用的是上海时区
+            event['end_time'].astimezone(tz),
+            thread_id
+        )
         t2 = time.time()
 
         video_info, error_log = get_video_duration(record_result['file_name'])
@@ -143,6 +148,9 @@ class StreamRecorder:
                                     file_name=file_name, video_url=url, video_resolution=video_info['resolution'],
                                     recovered_time=record_result['recovered_time'].astimezone(pytz.utc))
             os.remove(record_result['file_name'])
+        else:
+            # 无有效视频文件，标记事件状态 status = 2
+            mysql.update_video_info(db_table, event['video_id'], 2)
 
         log.info('video_info: %s, url: %s, video_id: %s.%s, time: %s',
                  video_info, url, db_table,

setup.py

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