|
@@ -108,10 +108,6 @@ class EquipmentManagerV3(View):
|
|
main_exist = Device_Info.objects.filter(UID=UID)
|
|
main_exist = Device_Info.objects.filter(UID=UID)
|
|
main_exist = main_exist.filter(~Q(vodPrimaryUserID='')).values('vodPrimaryUserID', 'vodPrimaryMaster')
|
|
main_exist = main_exist.filter(~Q(vodPrimaryUserID='')).values('vodPrimaryUserID', 'vodPrimaryMaster')
|
|
|
|
|
|
- # 添加到家庭房间
|
|
|
|
- if family_id:
|
|
|
|
- EquipmentFamilyView.family_room_device_save(family_id, room_id, id)
|
|
|
|
-
|
|
|
|
vodPrimaryUserID = userID
|
|
vodPrimaryUserID = userID
|
|
vodPrimaryMaster = userName
|
|
vodPrimaryMaster = userName
|
|
primaryUserID = ''
|
|
primaryUserID = ''
|
|
@@ -208,6 +204,10 @@ class EquipmentManagerV3(View):
|
|
View_Password=View_Password, Type=Type, ChannelIndex=ChannelIndex, version=version,
|
|
View_Password=View_Password, Type=Type, ChannelIndex=ChannelIndex, version=version,
|
|
vodPrimaryUserID=vodPrimaryUserID, vodPrimaryMaster=vodPrimaryMaster)
|
|
vodPrimaryUserID=vodPrimaryUserID, vodPrimaryMaster=vodPrimaryMaster)
|
|
userDevice.save()
|
|
userDevice.save()
|
|
|
|
+ # 添加到家庭房间
|
|
|
|
+ if family_id:
|
|
|
|
+ EquipmentFamilyView.family_room_device_save(family_id, room_id, userDevice.id)
|
|
|
|
+
|
|
uid_serial_qs = UIDCompanySerialModel.objects.filter(uid__uid=UID)
|
|
uid_serial_qs = UIDCompanySerialModel.objects.filter(uid__uid=UID)
|
|
if uid_serial_qs.exists():
|
|
if uid_serial_qs.exists():
|
|
uid_serial = uid_serial_qs[0]
|
|
uid_serial = uid_serial_qs[0]
|