fix: 插入数据库字段缺失

hikvision_isc_client/db/mysql.py

@@ -101,7 +101,7 @@ def get_camera_info(cursor, conn):
 
 @query()
 def insert_video_info(cursor, conn, db_table, device_code, file_name, start_time, end_time,
-                      recovered_time, video_url, video_resolution, status=0):
+                      recovered_time, video_url, video_resolution, biz_type, service_type, status=0):
     sql = '''
         insert {} (
             device_code, file_name, start_date, end_date,
@@ -112,7 +112,7 @@ def insert_video_info(cursor, conn, db_table, device_code, file_name, start_time
         value (%(device_code)s, %(file_name)s, %(start_time)s, %(end_time)s,
             %(recovered_time)s,
             %(video_url)s, %(video_resolution)s,
-            1, 1,
+            %(biz_type)s, %(service_type)s,
             date_add(now(),interval 31 day), %(status)s, now(), now()
         )
     '''.format(db_table)
@@ -124,7 +124,9 @@ def insert_video_info(cursor, conn, db_table, device_code, file_name, start_time
         'video_url': video_url,
         'video_resolution': video_resolution,
         'recovered_time': recovered_time,
-        'status': status
+        'status': status,
+        'biz_type': biz_type,
+        'service_type': service_type
     })
     video_id = cursor.lastrowid
     conn.commit()

hikvision_isc_client/merger.py

@@ -85,7 +85,9 @@ class EventMergerJob:
                     'end_time': event['end_time'].astimezone(pytz.utc).strftime('%Y-%m-%dT%H:%M:%S'),
                     'event_type': camera['event_type'],
                     'camera_code': camera['device_code'],
-                    'db_table': camera['db_table']
+                    'db_table': camera['db_table'],
+                    'biz_type': camera['biz_type'],
+                    'service_type': camera['service_type']
                 }
                 log.info(body)
                 channel.basic_publish(exchange='', routing_key=self.queue_name,

hikvision_isc_client/recorder.py

@@ -113,6 +113,7 @@ class StreamRecorder:
                                      body['start_time'], body['end_time'],
                                      recovered_time=record_result['recovered_time'].astimezone(pytz.utc),
                                      video_url=url, video_resolution=video_info['resolution'],
+                                     biz_type=body['biz_type'], service_type=body['service_type'],
                                      status=1 if record_result['is_completed'] else 2)
         log.info('video_info: %s, url: %s, video_id: %s.%s', video_info, url, body['db_table'], video_id)
         return True