|
|
@@ -339,47 +339,52 @@ def addInterface(request):
|
|
|
if re_uid.match(UID):
|
|
|
is_exist = Device_Info.objects.filter(UID=UID, userID_id=userID)
|
|
|
if is_exist:
|
|
|
- return response.json(174)
|
|
|
- else:
|
|
|
- # is_bind = Device_Info.objects.filter(UID=UID, isShare=False)
|
|
|
- # # 判断是否有已绑定用户
|
|
|
- # if is_bind:
|
|
|
- # return response.json(15)
|
|
|
- try:
|
|
|
- # 判断是否有用户绑定
|
|
|
- nowTime = int(time.time())
|
|
|
- us_qs = UidSetModel.objects.filter(uid=UID)
|
|
|
- if not us_qs.exists():
|
|
|
- uid_set_create_dict = {
|
|
|
- 'uid': UID,
|
|
|
- 'addTime': nowTime,
|
|
|
- 'updTime': nowTime,
|
|
|
- 'ip': CommonService.get_ip_address(request),
|
|
|
- 'channel': ChannelIndex,
|
|
|
- 'nickname': NickName,
|
|
|
- }
|
|
|
- UidSetModel.objects.create(**uid_set_create_dict)
|
|
|
- pk = CommonService.getUserID(getUser=False)
|
|
|
- userDevice = Device_Info(id=pk, userID_id=userID, UID=UID,
|
|
|
- NickName=NickName, View_Account=View_Account,
|
|
|
- View_Password=View_Password, Type=Type, ChannelIndex=ChannelIndex)
|
|
|
- userDevice.save()
|
|
|
- except Exception as e:
|
|
|
- return response.json(10, repr(e))
|
|
|
+ # 判断设备是否已存在
|
|
|
+ if is_exist[0].isExist == 1:
|
|
|
+ return response.json(174)
|
|
|
else:
|
|
|
- dvqs = Device_Info.objects.filter(id=pk).values('id', 'userID', 'NickName', 'UID',
|
|
|
- 'View_Account',
|
|
|
- 'View_Password', 'ChannelIndex', 'Type',
|
|
|
- 'isShare',
|
|
|
- 'primaryUserID', 'primaryMaster',
|
|
|
- 'data_joined', 'version',
|
|
|
- 'isVod', 'isExist')
|
|
|
- dvql = CommonService.qs_to_list(dvqs)
|
|
|
- ubqs = UID_Bucket.objects.filter(uid=UID). \
|
|
|
- values('bucket__content', 'status', 'channel', 'endTime', 'uid')
|
|
|
- res = dvql[0]
|
|
|
- res['vod'] = list(ubqs)
|
|
|
- return response.json(0, res)
|
|
|
+ is_exist.delete()
|
|
|
+ pass
|
|
|
+ # is_bind = Device_Info.objects.filter(UID=UID, isShare=False)
|
|
|
+ # # 判断是否有已绑定用户
|
|
|
+ # if is_bind:
|
|
|
+ # return response.json(15)
|
|
|
+ try:
|
|
|
+ # 判断是否有用户绑定
|
|
|
+ nowTime = int(time.time())
|
|
|
+ us_qs = UidSetModel.objects.filter(uid=UID)
|
|
|
+ if not us_qs.exists():
|
|
|
+ uid_set_create_dict = {
|
|
|
+ 'uid': UID,
|
|
|
+ 'addTime': nowTime,
|
|
|
+ 'updTime': nowTime,
|
|
|
+ 'ip': CommonService.get_ip_address(request),
|
|
|
+ 'channel': ChannelIndex,
|
|
|
+ 'nickname': NickName,
|
|
|
+ }
|
|
|
+ UidSetModel.objects.create(**uid_set_create_dict)
|
|
|
+ pk = CommonService.getUserID(getUser=False)
|
|
|
+ userDevice = Device_Info(id=pk, userID_id=userID, UID=UID,
|
|
|
+ NickName=NickName, View_Account=View_Account,
|
|
|
+ View_Password=View_Password, Type=Type, ChannelIndex=ChannelIndex)
|
|
|
+ userDevice.save()
|
|
|
+ except Exception as e:
|
|
|
+ return response.json(10, repr(e))
|
|
|
+ else:
|
|
|
+ dvqs = Device_Info.objects.filter(id=pk).values('id', 'userID', 'NickName', 'UID',
|
|
|
+ 'View_Account',
|
|
|
+ 'View_Password', 'ChannelIndex', 'Type',
|
|
|
+ 'isShare',
|
|
|
+ 'primaryUserID', 'primaryMaster',
|
|
|
+ 'data_joined', 'version',
|
|
|
+ 'isVod', 'isExist')
|
|
|
+ dvql = CommonService.qs_to_list(dvqs)
|
|
|
+ ubqs = UID_Bucket.objects.filter(uid=UID). \
|
|
|
+ values('bucket__content', 'status', 'channel', 'endTime', 'uid')
|
|
|
+ res = dvql[0]
|
|
|
+ res['vod'] = list(ubqs)
|
|
|
+ return response.json(0, res)
|
|
|
+
|
|
|
|
|
|
else:
|
|
|
return response.json(444, {'param': 'UID'})
|
chenjunkai