|
|
@@ -98,18 +98,16 @@ class DetectControllerView(View):
|
|
|
for p in qr:
|
|
|
devUid = p['devUid']
|
|
|
eventTime = p['eventTime']
|
|
|
+ channel = p['Channel']
|
|
|
if p['is_st'] == 1:
|
|
|
p['img'] = img_bucket.sign_url('GET', '{uid}/{channel}/{time}.jpeg'.
|
|
|
format(uid=devUid, channel=p['Channel'], time=eventTime), 300)
|
|
|
p['img_list'] = [img_bucket.sign_url('GET', '{uid}/{channel}/{time}.jpeg'.
|
|
|
- format(uid=devUid, channel=p['Channel'], time=eventTime), 300)]
|
|
|
+ format(uid=devUid, channel=channel, time=eventTime), 300)]
|
|
|
elif p['is_st'] == 2:
|
|
|
# 列表装载回放时间戳标记
|
|
|
- vodqs = VodHlsModel.objects.filter(uid=uid, channel=p['Channel'], time=eventTime) \
|
|
|
+ vodqs = VodHlsModel.objects.filter(uid=uid, channel=channel, time=int(eventTime)) \
|
|
|
.values("bucket__bucket", "bucket__endpoint")
|
|
|
- print('xxxxxx')
|
|
|
- print(vodqs)
|
|
|
- print('xxxxxx')
|
|
|
if vodqs.exists():
|
|
|
bucket_name = vodqs[0]['bucket__bucket']
|
|
|
endpoint = vodqs[0]['bucket__endpoint']
|
chenjunkai