|
|
@@ -79,7 +79,7 @@ class DetectControllerView(View):
|
|
|
if not qs.exists():
|
|
|
return response.json(0, {'datas': [], 'count': 0})
|
|
|
qs = qs.values('id', 'devUid', 'devNickName', 'Channel', 'eventType', 'status', 'alarm', 'eventTime',
|
|
|
- 'receiveTime')
|
|
|
+ 'receiveTime','is_st')
|
|
|
count = qs.count()
|
|
|
qr = qs[(page - 1) * line:page * line]
|
|
|
# send_json = CommonService.qs_to_dict(res)
|
|
|
@@ -88,7 +88,8 @@ class DetectControllerView(View):
|
|
|
auth = oss2.Auth('LTAIyMkGfEdogyL9', '71uIjpsqVOmF7DAITRyRuc259jHOjO')
|
|
|
bucket = oss2.Bucket(auth, 'oss-cn-shenzhen.aliyuncs.com', 'apg')
|
|
|
for p in qr:
|
|
|
- p['img'] = bucket.sign_url('GET',
|
|
|
+ if p['is_st'] == '1':
|
|
|
+ p['img'] = bucket.sign_url('GET',
|
|
|
'{uid}/{channel}/{time}.jpeg'.format(uid=p['devUid'], channel=p['Channel'],
|
|
|
time=p['eventTime']), 300)
|
|
|
res.append(p)
|
chenjunkai