uid vf

Ansjer/test/thumnber.py

@@ -1,40 +0,0 @@
-#!/usr/bin/env python3  
-# -*- coding: utf-8 -*-  
-"""
-@Copyright (C) ansjer cop Video Technology Co.,Ltd.All rights reserved.
-@AUTHOR: ASJRD018
-@NAME: AnsjerFormal
-@software: PyCharm
-@DATE: 2019/4/1 9:41
-@Version: python3.6
-@MODIFY DECORD:ansjer dev
-@file: xls.py
-@Contact: chanjunkai@163.com
-"""
-
-import urllib
-import oss2
-
-OSS_STS_ACCESS_KEY = 'LTAIyMkGfEdogyL9'
-OSS_STS_ACCESS_SECRET = '71uIjpsqVOmF7DAITRyRuc259jHOjO'
-auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
-bucket_name = 'cnvod2'
-endpoint = 'oss-cn-shenzhen.aliyuncs.com'
-bucket = oss2.Bucket(auth, endpoint, bucket_name)
-ts = 'VVDHCVBYDKFMJRWA111A/vod1/1555646083/ts0.ts'
-url = bucket.sign_url('GET', ts, 36000, params={'x-oss-process': 'hls/sign'})
-urllst = url.split('?')
-url_start = urllib.parse.unquote(urllst[0])
-url_end = urllst[1]
-vod_play_url = '{url_start}?{url_end}'. \
-    format(url_start=url_start, url_end=url_end)
-thumb0 = bucket.sign_url('GET', ts, 3600, params={'x-oss-process': 'video/snapshot,t_0000,w_700'})
-thumb1 = bucket.sign_url('GET', ts, 3600, params={'x-oss-process': 'video/snapshot,t_1000,w_700'})
-thumb2 = bucket.sign_url('GET', ts, 3600, params={'x-oss-process': 'video/snapshot,t_2000,w_700'})
-thumb3 = bucket.sign_url('GET', ts, 3600, params={'x-oss-process': 'video/snapshot,t_3000,w_700'})
-thumb4 = bucket.sign_url('GET', ts, 3600, params={'x-oss-process': 'video/snapshot,t_4000,w_700'})
-print(thumb0)
-print(thumb1)
-print(thumb2)
-print(thumb3)
-print(thumb4)

Controller/EquipmentManager.py

@@ -597,7 +597,10 @@ def queryInterface(request):
         nowTime = int(time.time())
         data = []
         # 设备拓展信息表
-        us_qs = UidSetModel.objects.filter(uid__in=uid_list).values('uid','version')
+        us_qs = UidSetModel.objects.filter(uid__in=uid_list).values('uid', 'version')
+        uv_dict = {}
+        for us in us_qs:
+            uv_dict[us['uid']] = us['version']
         for p in dvls:
             p['vod'] = []
             for dm in ubqs:
@@ -610,9 +613,7 @@ def queryInterface(request):
                     obj = 'uid_preview/{uid}/channel_{channel}.png'.format(uid=up['uid'], channel=up['channel'])
                     img_sign = bucket.sign_url('GET', obj, 300)
                     p['preview'].append(img_sign)
-            for us in us_qs:
-                if p['UID'] == us['uid']:
-                    p['uid_version'] = us['version']
+            p['uid_version'] = uv_dict[p['UID']] if p['UID'] in uv_dict else ''
             data.append(p)
         return response.json(0, data)
     else: