去除设备新增表的主次用户

Controller/CloudStorage.py

@@ -776,13 +776,13 @@ class CloudStorageView(View):
                         }
                         dvq.update(**dvq_set_update_dict)
 
-                    uid_main_exist = UIDMainUser.objects.filter(UID=UID)
-                    if not uid_main_exist.exists():
-                        uid_main_dict = {
-                            'UID': UID,
-                            'user_id': userid
-                        }
-                        UIDMainUser.objects.create(**uid_main_dict)
+                    # uid_main_exist = UIDMainUser.objects.filter(UID=UID)
+                    # if not uid_main_exist.exists():
+                    #     uid_main_dict = {
+                    #         'UID': UID,
+                    #         'user_id': userid
+                    #     }
+                    #     UIDMainUser.objects.create(**uid_main_dict)
 
                     order_qs.update(status=1, updTime=nowTime, uid_bucket_id=uid_bucket_id)
                     sys_msg_text_list = ['成功购买云存', 'Successful purchase of cloud storage']
@@ -881,13 +881,13 @@ class CloudStorageView(View):
                     }
                     dvq.update(**dvq_set_update_dict)
 
-                uid_main_exist = UIDMainUser.objects.filter(UID=UID)
-                if not uid_main_exist.exists():
-                    uid_main_dict = {
-                        'UID': UID,
-                        'user_id': userid
-                    }
-                    UIDMainUser.objects.create(**uid_main_dict)
+                # uid_main_exist = UIDMainUser.objects.filter(UID=UID)
+                # if not uid_main_exist.exists():
+                #     uid_main_dict = {
+                #         'UID': UID,
+                #         'user_id': userid
+                #     }
+                #     UIDMainUser.objects.create(**uid_main_dict)
 
                 order_qs.update(status=1, updTime=nowTime, uid_bucket_id=uid_bucket_id)
                 sys_msg_text_list = ['成功购买云存','Successful purchase of cloud storage']
@@ -981,13 +981,13 @@ class CloudStorageView(View):
                         }
                         dvq.update(**dvq_set_update_dict)
 
-                    uid_main_exist = UIDMainUser.objects.filter(UID=UID)
-                    if not uid_main_exist.exists():
-                        uid_main_dict = {
-                            'UID': UID,
-                            'user_id': userid
-                        }
-                        UIDMainUser.objects.create(**uid_main_dict)
+                    # uid_main_exist = UIDMainUser.objects.filter(UID=UID)
+                    # if not uid_main_exist.exists():
+                    #     uid_main_dict = {
+                    #         'UID': UID,
+                    #         'user_id': userid
+                    #     }
+                    #     UIDMainUser.objects.create(**uid_main_dict)
 
                     order_qs.update(status=1, updTime=nowTime, uid_bucket_id=uid_bucket_id)
                     sys_msg_text_list = ['成功购买云存', 'Successful purchase of cloud storage']
@@ -1261,13 +1261,13 @@ class CloudStorageView(View):
                     }
                     dvq.update(**dvq_set_update_dict)
 
-                uid_main_exist = UIDMainUser.objects.filter(UID=uid)
-                if not uid_main_exist.exists():
-                    uid_main_dict = {
-                        'UID': uid,
-                        'user_id': userID
-                    }
-                    UIDMainUser.objects.create(**uid_main_dict)
+                # uid_main_exist = UIDMainUser.objects.filter(UID=uid)
+                # if not uid_main_exist.exists():
+                #     uid_main_dict = {
+                #         'UID': uid,
+                #         'user_id': userID
+                #     }
+                #     UIDMainUser.objects.create(**uid_main_dict)
 
                 sys_msg_text_list = ['成功购买云存', 'Successful purchase of cloud storage']
                 # return response.json(0)

Controller/CloudTransfer.py

@@ -76,11 +76,11 @@ class cloudTestView(View):
             if vodPrimaryUserID != '' and vodPrimaryUserID != oldUserID:
                 return response.json(10037)
 
-            uid_mian = UIDMainUser.objects.filter(UID=uid).values('UID', 'user_id')
-            if uid_mian.exists():
-                vodPrimaryUserID = uid_mian[0]['user_id']
-                if vodPrimaryUserID != '' and vodPrimaryUserID != oldUserID:
-                    return response.json(10037)
+            # uid_mian = UIDMainUser.objects.filter(UID=uid).values('UID', 'user_id')
+            # if uid_mian.exists():
+            #     vodPrimaryUserID = uid_mian[0]['user_id']
+            #     if vodPrimaryUserID != '' and vodPrimaryUserID != oldUserID:
+            #         return response.json(10037)
 
             # 判断新用户是否已有此设备
             new_deviceInfo_qs = Device_Info.objects.filter(userID_id=newUserID, UID=uid, isExist=1)
@@ -99,12 +99,12 @@ class cloudTestView(View):
                 Device_Info.objects.filter(UID=uid).update(vodPrimaryUserID=vodPrimaryUserID, vodPrimaryMaster=vodPrimaryMaster)
                 VodHlsModel.objects.filter(uid=uid).delete()
 
-                UIDMainUser.objects.filter(UID=uid).delete()
-                uid_main_dict = {
-                    'UID': uid,
-                    'user_id': newUserID
-                }
-                UIDMainUser.objects.create(**uid_main_dict)
+                # UIDMainUser.objects.filter(UID=uid).delete()
+                # uid_main_dict = {
+                #     'UID': uid,
+                #     'user_id': newUserID
+                # }
+                # UIDMainUser.objects.create(**uid_main_dict)
 
         except Exception as e:
             # print(e)

Controller/EquipmentManager.py

@@ -421,13 +421,13 @@ def addInterface(request):
                 if is_bind and isvodPrimaryUserID != userID and isvodPrimaryUserID != '':
                     isusermain = True
 
-                uid_main_exist = UIDMainUser.objects.filter(UID=UID).values('UID', 'user_id')
-                if uid_main_exist.exists():
-                    vodPrimaryUserID = uid_main_exist[0]['user_id']
-                    vodPrimaryMaster = Device_User.objects.get(userID=vodPrimaryUserID).username
-
-                    if vodPrimaryUserID != userID:
-                        isusermain = True
+                # uid_main_exist = UIDMainUser.objects.filter(UID=UID).values('UID', 'user_id')
+                # if uid_main_exist.exists():
+                #     vodPrimaryUserID = uid_main_exist[0]['user_id']
+                #     vodPrimaryMaster = Device_User.objects.get(userID=vodPrimaryUserID).username
+                #
+                #     if vodPrimaryUserID != userID:
+                #         isusermain = True
 
                 # 判断是否有已绑定用户
                 if isCheckMainUser == '1' and isusermain:
@@ -496,12 +496,12 @@ def addInterface(request):
                     else:
                         Device_Info.objects.filter(UID=UID).update(vodPrimaryUserID=vodPrimaryUserID,
                                                                    vodPrimaryMaster=vodPrimaryMaster)
-                    if isCheckMainUser == '1':
-                        uid_main_dict = {
-                            'UID': UID,
-                            'user_id': vodPrimaryUserID
-                        }
-                        UIDMainUser.objects.create(**uid_main_dict)
+                    # if isCheckMainUser == '1':
+                    #     uid_main_dict = {
+                    #         'UID': UID,
+                    #         'user_id': vodPrimaryUserID
+                    #     }
+                    #     UIDMainUser.objects.create(**uid_main_dict)
                 # redisObj = RedisObject(db=8)
                     # redisObj.del_data(key='uid_qs_' + userID)
                 except Exception as e:

Controller/EquipmentManagerV3.py

@@ -126,13 +126,13 @@ class EquipmentManagerV3(View):
                     if is_bind and isvodPrimaryUserID != userID and isvodPrimaryUserID != '':
                         isusermain = True
 
-                    uid_main_exist = UIDMainUser.objects.filter(UID=UID).values('UID', 'user_id')
-                    if uid_main_exist.exists():
-                        vodPrimaryUserID = uid_main_exist[0]['user_id']
-                        vodPrimaryMaster = Device_User.objects.get(userID=vodPrimaryUserID).username
-
-                        if vodPrimaryUserID != userID:
-                            isusermain = True
+                    # uid_main_exist = UIDMainUser.objects.filter(UID=UID).values('UID', 'user_id')
+                    # if uid_main_exist.exists():
+                    #     vodPrimaryUserID = uid_main_exist[0]['user_id']
+                    #     vodPrimaryMaster = Device_User.objects.get(userID=vodPrimaryUserID).username
+                    #
+                    #     if vodPrimaryUserID != userID:
+                    #         isusermain = True
 
 
 
@@ -205,12 +205,12 @@ class EquipmentManagerV3(View):
                             Device_Info.objects.filter(UID=UID).update(vodPrimaryUserID=vodPrimaryUserID,
                                                                        vodPrimaryMaster=vodPrimaryMaster)
 
-                        if isCheckMainUser == '1':
-                            uid_main_dict = {
-                                'UID': UID,
-                                'user_id': vodPrimaryUserID
-                            }
-                            UIDMainUser.objects.create(**uid_main_dict)
+                        # if isCheckMainUser == '1':
+                        #     uid_main_dict = {
+                        #         'UID': UID,
+                        #         'user_id': vodPrimaryUserID
+                        #     }
+                        #     UIDMainUser.objects.create(**uid_main_dict)
 
                         if not us_qs.exists():
                             us_qs = UidSetModel.objects.filter(uid=UID)
@@ -738,11 +738,11 @@ class EquipmentManagerV3(View):
             qs = Device_User.objects.filter(userID=dvq[0]['vodPrimaryUserID']).values('userID', 'NickName', 'username', 'userEmail', 'phone')
             qs = CommonService.qs_to_list(qs)
 
-        if not qs:
-            uidq = UIDMainUser.objects.filter(UID=UID).values('user_id')
-            if uidq.exists():
-                qs = Device_User.objects.filter(userID=uidq[0]['user_id']).values('userID', 'NickName', 'username', 'userEmail', 'phone')
-                qs = CommonService.qs_to_list(qs)
+        # if not qs:
+        #     uidq = UIDMainUser.objects.filter(UID=UID).values('user_id')
+        #     if uidq.exists():
+        #         qs = Device_User.objects.filter(userID=uidq[0]['user_id']).values('userID', 'NickName', 'username', 'userEmail', 'phone')
+        #         qs = CommonService.qs_to_list(qs)
 
         return response.json(0, qs)
 

Controller/UidSetController.py

@@ -500,7 +500,7 @@ class UidSetView(View):
                     StsCrdModel.objects.filter(uid=uid).delete()
                     VodHlsModel.objects.filter(uid=uid).delete()
                     ExperienceContextModel.objects.filter(uid=uid).delete()
-                    UIDMainUser.objects.filter(UID=uid).delete()
+                    # UIDMainUser.objects.filter(UID=uid).delete()
                     Device_Info.objects.filter(UID=uid).update(vodPrimaryUserID='', vodPrimaryMaster='')
             except Exception as e:
                 print(e)