|
|
@@ -603,19 +603,17 @@ def queryInterface(request):
|
|
|
dvls = CommonService.qs_to_list(dvql)
|
|
|
uid_list = []
|
|
|
for dvl in dvls:
|
|
|
- if dvl['isShare'] is False:
|
|
|
- uid_list.append(dvl['UID'])
|
|
|
+ uid_list.append(dvl['UID'])
|
|
|
+ # if dvl['isShare'] is False:
|
|
|
+ # uid_list.append(dvl['UID'])
|
|
|
ubqs = UID_Bucket.objects.filter(uid__in=uid_list). \
|
|
|
values('bucket__content', 'status', 'channel', 'endTime', 'uid')
|
|
|
upqs = UID_Preview.objects.filter(uid__in=uid_list).order_by('channel').values('id', 'uid', 'channel')
|
|
|
- # auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
|
|
|
- # uidPreview_bucket = oss2.Bucket(auth, 'oss-cn-shenzhen.aliyuncs.com', 'apg')
|
|
|
auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
|
|
|
bucket = oss2.Bucket(auth, 'oss-cn-hongkong.aliyuncs.com', 'statres')
|
|
|
nowTime = int(time.time())
|
|
|
data = []
|
|
|
# 设备拓展信息表
|
|
|
- var_dump(uid_list)
|
|
|
us_qs = UidSetModel.objects.filter(uid__in=uid_list).values('uid', 'version')
|
|
|
uv_dict = {}
|
|
|
for us in us_qs:
|
chenjunkai