|
|
@@ -596,6 +596,8 @@ def queryInterface(request):
|
|
|
bucket = oss2.Bucket(auth, 'oss-cn-hongkong.aliyuncs.com', 'statres')
|
|
|
nowTime = int(time.time())
|
|
|
data = []
|
|
|
+ # 设备拓展信息表
|
|
|
+ us_qs = UidSetModel.objects.filter(uid__in=uid_list).values('uid','version')
|
|
|
for p in dvls:
|
|
|
p['vod'] = []
|
|
|
for dm in ubqs:
|
|
|
@@ -608,6 +610,9 @@ 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']
|
|
|
data.append(p)
|
|
|
return response.json(0, data)
|
|
|
else:
|
chenjunkai