ils-video-merger:修改发送rabbitmq消息内容

ils-video-recorder:修改多海康账号配置问题

ils_common_video/db/mysql.py

@@ -110,7 +110,7 @@ def get_camera_info(cursor, conn, camera_code=None, platform='isc', video_plan_t
 
     sql = '''
         select
-            id       as camera_id,
+            camera_info.id       as camera_id,
             name     as camera_name,
             point_index_code,
             '131331' as event_type,
@@ -121,10 +121,13 @@ def get_camera_info(cursor, conn, camera_code=None, platform='isc', video_plan_t
             region_path_name,
             video_plan_type,
             network_quality,
-            is_valid, platform, treaty, model, brand, cac.video_stream_url
+            is_valid, platform, treaty, model, brand, cac.video_stream_url,cac.video_stream_url ,account.app_key,account.app_secret,
+            SUBSTRING_INDEX(account.req_url,':',1) as req_ip,
+            SUBSTRING_INDEX(account.req_url,':',-1) as req_port
         from camera_info
             left join camera_ai_config cac
             on camera_info.id = cac.camera_info_id
+            LEFT JOIN camera_account_config account on camera_info.account_id = account.id
         {}
         order by create_time;
     '''.format(_filter)

ils_common_video/isc_video/merger.py

@@ -128,6 +128,10 @@ class EventMergerJob:
             'camera_code': camera['device_code'],
             'camera_index': camera['point_index_code'],
             'db_table': camera['db_table'],
+            'hik_app_key': camera['app_key'],
+            'hik_app_secret': camera['app_secret'],
+            'hik_req_ip': camera['req_ip'],
+            'hik_req_port': camera['req_port'],
         }
         # 预留三分钟不处理
         now = datetime.utcnow() - timedelta(minutes=3)

ils_common_video/isc_video/recorder.py

@@ -27,9 +27,9 @@ tz = pytz.timezone('Asia/Shanghai')
 video_path = '/tmp/videos/isc-record'
 os.makedirs(video_path, exist_ok=True)
 
-hk_config = dynaconf.settings.get('ISC')
-hik_client = HikVisionClient(str(hk_config.get('KEY')), hk_config.get('SECRET'),
-                             hk_config.get('HOST'), hk_config.get('PORT'))
+# hk_config = dynaconf.settings.get('ISC')
+# hik_client = HikVisionClient(str(hk_config.get('KEY')), hk_config.get('SECRET'),
+#                              hk_config.get('HOST'), hk_config.get('PORT'))
 # api_helper = IntelabApiHelper()
 
 
@@ -375,6 +375,8 @@ class ProcessMessage:
         res = {'file_name': file_name, 'is_completed': False, 'recovered_time': start_time}
 
         try:
+            hik_client = HikVisionClient(body['hik_app_key'],body['hik_app_secret'],
+                                         body['hik_req_ip'], body['hik_req_port'])
             playback_urls = hik_client.get_cameras_playback_urls(
                 body['camera_index'],
                 IntelabApiHelper.iso_format(start_time),