fix: [merger] 修复定时任务

isc_video_record/merger.py

@@ -15,7 +15,7 @@ from intelab_python_sdk.logger import log
 from isc_video_record.db import rabbitmq_connect, redis_connect, mysql
 from isc_video_record.utils.alarm_utils import send_alarm_to_developer, send_markdown
 from isc_video_record.utils.record_utils import get_time_str
-from isc_video_record.const import LAST_CHECK_TIME_KEY, PROCESSING_TOTAL_KEY
+from isc_video_record.const import LAST_CHECK_TIME_KEY, PROCESSING_CAMERA_KEY
 from isc_video_record.pre_event import PreEvent
 from isc_video_record.db.mysql import get_camera_info, insert_video_info
 from isc_video_record.utils.excel_utils import gen_excel
@@ -27,7 +27,7 @@ tz = pytz.timezone(TIMEZONE)
 text = """
 - 当前处于录制中的摄像头个数为：{}
 - 未处理视频总时长：{}
-- 未处理视频摄像头个数：{}
+- 所属视频摄像头个数：{}
 """
 
 
@@ -39,7 +39,7 @@ class EventMergerJob:
 
         schedulers = BackgroundScheduler({
             'apscheduler.timezone': TIMEZONE})
-        schedulers.add_job(self.run_moniter_hour, 'cron', minute=0)
+        schedulers.add_job(self.run_moniter_hour, 'cron', minute='0,30')
         schedulers.add_job(self.run_moniter_daily, 'cron', hour=10, minute=30)
         schedulers.start()
 
@@ -61,7 +61,7 @@ class EventMergerJob:
             'value': 0, 'camera_count': 0}
         with redis_connect() as pipe:
             send_markdown('isc巡检', text.format(
-                pipe.get(PROCESSING_TOTAL_KEY) or 0,
+                len(pipe.keys(PROCESSING_CAMERA_KEY.format('*'))),
                 get_time_str(pre_video_duration['value']),
                 pre_video_duration['camera_count']
             ))