提交 3d397870 authored 作者: zw.wang's avatar zw.wang

feat: [recorder] 修改录制优先顺序

上级 efb16986
...@@ -171,7 +171,7 @@ def update_video_info(cursor, conn, db_table, video_id, status, ...@@ -171,7 +171,7 @@ def update_video_info(cursor, conn, db_table, video_id, status,
@query(cursor_dict=True) @query(cursor_dict=True)
def get_untreated_events(cursor, conn, db_table, camera_code, status=3, **kw): def get_untreated_events(cursor, conn, db_table, camera_code, status=3, order_by='create_time', **kw):
if 'retry' in kw: if 'retry' in kw:
sub_str = '((status = 2 and next_retry_time < now()) or status = 3 or status = 0)' sub_str = '((status = 2 and next_retry_time < now()) or status = 3 or status = 0)'
...@@ -192,8 +192,8 @@ def get_untreated_events(cursor, conn, db_table, camera_code, status=3, **kw): ...@@ -192,8 +192,8 @@ def get_untreated_events(cursor, conn, db_table, camera_code, status=3, **kw):
where device_code = %s where device_code = %s
and create_time > date_sub(now(), interval 7 day) and create_time > date_sub(now(), interval 7 day)
and {} and {}
order by create_time order by {}
'''.format(db_table, sub_str) '''.format(db_table, sub_str, order_by)
cursor.execute(sql, [camera_code]) cursor.execute(sql, [camera_code])
return cursor.fetchall() return cursor.fetchall()
......
...@@ -141,7 +141,8 @@ class ProcessMessage: ...@@ -141,7 +141,8 @@ class ProcessMessage:
thread_id = threading.get_ident() thread_id = threading.get_ident()
ack = False ack = False
events = mysql.get_untreated_events(body['db_table'], body['camera_code'], retry=True) events = mysql.get_untreated_events(body['db_table'], body['camera_code'],
order_by='start_time desc', retry=True)
log.info('%s: events count: %s', body['camera_code'], len(events)) log.info('%s: events count: %s', body['camera_code'], len(events))
for event in events: for event in events:
......
...@@ -24,7 +24,7 @@ requires = [ ...@@ -24,7 +24,7 @@ requires = [
setuptools.setup( setuptools.setup(
name='isc-video-record', name='isc-video-record',
version='1.0.0b16', version='1.0.0b17',
description='ISC motion detection playback video stream recording service.', description='ISC motion detection playback video stream recording service.',
long_description=long_description, long_description=long_description,
long_description_content_type='text/markdown', long_description_content_type='text/markdown',
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论