|
|
@@ -30,7 +30,7 @@ def queryUserEquipmentInterface(request):
|
|
|
return response.json(104)
|
|
|
dvqs = Device_Info.objects.filter(userID_id=userID)
|
|
|
dvdict = CommonService.qs_to_dict(dvqs)
|
|
|
- uid_list = Device_Info.objects.filter(userID_id=userID, isShare=False).\
|
|
|
+ uid_list = Device_Info.objects.filter(userID_id=userID, isShare=False). \
|
|
|
values_list('UID', flat=True)
|
|
|
ubqs = UID_Bucket.objects.filter(uid__in=uid_list). \
|
|
|
values('bucket__content', 'status', 'channel', 'endTime', 'uid')
|
|
|
@@ -40,8 +40,9 @@ def queryUserEquipmentInterface(request):
|
|
|
for dm in ubqs:
|
|
|
if p['fields']['UID'] == dm['uid']:
|
|
|
p['fields']['vod'].append(dm)
|
|
|
+ p['fields']['primaryUserID'] = ''
|
|
|
res.append(p)
|
|
|
- return response.json(0, {'datas':res})
|
|
|
+ return response.json(0, {'datas': res})
|
|
|
|
|
|
|
|
|
@csrf_exempt
|
|
|
@@ -73,7 +74,7 @@ def addNewUserEquipmentInterface(request):
|
|
|
else:
|
|
|
UID = deviceData.get('UID', None)
|
|
|
if not UID:
|
|
|
- return response.json(444,'content')
|
|
|
+ return response.json(444, 'content')
|
|
|
dValid = Device_Info.objects.filter(userID=userID, UID=UID)
|
|
|
if dValid:
|
|
|
return response.json(174)
|
|
|
@@ -101,7 +102,7 @@ def addNewUserEquipmentInterface(request):
|
|
|
**deviceData)
|
|
|
userDevice.save()
|
|
|
else:
|
|
|
- return response.json(444,'UID')
|
|
|
+ return response.json(444, 'UID')
|
|
|
|
|
|
except Exception as e:
|
|
|
errorInfo = traceback.format_exc()
|
|
|
@@ -193,6 +194,7 @@ def deleteInterface(request):
|
|
|
else:
|
|
|
return response.json(0)
|
|
|
|
|
|
+
|
|
|
@csrf_exempt
|
|
|
def modifyUserEquipmentInterface(request):
|
|
|
'''
|
chenjunkai