回滚转移设备代码

Controller/CloudTransfer.py

@@ -15,7 +15,7 @@ from Service.ModelService import ModelService
 from Object.ResponseObject import ResponseObject
 from django.db.models import Q
 from Model.models import Device_User, Device_Info, Order_Model, UID_Bucket, StsCrdModel, VodHlsModel, Unused_Uid_Meal, \
-    VodBucketModel, UIDMainUser, FamilyRoomDevice
+    VodBucketModel, UIDMainUser
 
 
 class cloudTestView(View):
@@ -54,14 +54,13 @@ class cloudTestView(View):
         oldUserID = request_dict.get("oldUserID", None)
         username = request_dict.get("username", None)
         uid = request_dict.get('uid', None)
-        family_id = request_dict.get('familyId', None)
-        room_id = request_dict.get('roomId', 0)
         now_time = CommonService.timestamp_to_str(int(time.time()))
         # print('now_time: ', now_time)
 
         try:
             # 查询该userID下是否存在此设备
-            old_deviceInfo_qs = Device_Info.objects.filter(userID_id=oldUserID, UID=uid, isExist=1).values()
+            old_deviceInfo_qs = Device_Info.objects.filter(userID_id=oldUserID, UID=uid, isExist=1).values('isShare',
+                                                                                                           'vodPrimaryUserID')
             if not old_deviceInfo_qs.exists():
                 return response.json(10008)
 
@@ -102,16 +101,12 @@ class cloudTestView(View):
             vodPrimaryMaster = newUserName
 
             with transaction.atomic():
-                # 更新旧设备的userID,设备添加时间,关闭推送消息提醒,主用户信息
-                old_deviceInfo_qs.update(userID=newUserID, data_joined=now_time, NotificationMode=0,
-                                         vodPrimaryUserID=vodPrimaryUserID,
-                                         vodPrimaryMaster=vodPrimaryMaster)
+                # 更新旧设备的userID,设备添加时间,关闭推送消息提醒
+                old_deviceInfo_qs.update(userID=newUserID, data_joined=now_time, NotificationMode=0)
                 # 更新设备的主用户信息
-                # new_device_qs = Device_Info.objects.filter(UID=uid).update(vodPrimaryUserID=vodPrimaryUserID,
-                #                                                            vodPrimaryMaster=vodPrimaryMaster)
+                Device_Info.objects.filter(UID=uid).update(vodPrimaryUserID=vodPrimaryUserID,
+                                                           vodPrimaryMaster=vodPrimaryMaster)
                 VodHlsModel.objects.filter(uid=uid).delete()
-                FamilyRoomDevice.objects.filter(device_id=old_deviceInfo_qs[0]['id']).update(family_id=family_id,
-                                                                                             room_id=room_id)
 
                 # UIDMainUser.objects.filter(UID=uid).delete()
                 # uid_main_dict = {