设备添加新表 记录主次用户2

Controller/CloudStorage.py

@@ -779,7 +779,7 @@ class CloudStorageView(View):
                     if not uid_main_exist.exists():
                         uid_main_dict = {
                             'UID': UID,
-                            'userID': userid
+                            'user_id': userid
                         }
                         UIDMainUser.objects.create(**uid_main_dict)
 
@@ -884,7 +884,7 @@ class CloudStorageView(View):
                 if not uid_main_exist.exists():
                     uid_main_dict = {
                         'UID': UID,
-                        'userID': userid
+                        'user_id': userid
                     }
                     UIDMainUser.objects.create(**uid_main_dict)
 
@@ -984,7 +984,7 @@ class CloudStorageView(View):
                     if not uid_main_exist.exists():
                         uid_main_dict = {
                             'UID': UID,
-                            'userID': userid
+                            'user_id': userid
                         }
                         UIDMainUser.objects.create(**uid_main_dict)
 
@@ -1264,7 +1264,7 @@ class CloudStorageView(View):
                 if not uid_main_exist.exists():
                     uid_main_dict = {
                         'UID': uid,
-                        'userID': userID
+                        'user_id': userID
                     }
                     UIDMainUser.objects.create(**uid_main_dict)
 

Controller/CloudTransfer.py

@@ -76,9 +76,9 @@ class cloudTestView(View):
             if vodPrimaryUserID != '' and vodPrimaryUserID != oldUserID:
                 return response.json(10037)
 
-            uid_mian = UIDMainUser.objects.filter(UID=uid).values('UID','userID__userID')
+            uid_mian = UIDMainUser.objects.filter(UID=uid).values('UID', 'user_id')
             if uid_mian.exists():
-                vodPrimaryUserID = uid_mian[0]['userID__userID']
+                vodPrimaryUserID = uid_mian[0]['user_id']
                 if vodPrimaryUserID != '' and vodPrimaryUserID != oldUserID:
                     return response.json(10037)
 

Controller/EquipmentManager.py

@@ -402,10 +402,10 @@ def addInterface(request):
                     vodPrimaryUserID = main_exist[0]['vodPrimaryUserID']
                     vodPrimaryMaster = main_exist[0]['vodPrimaryMaster']
 
-                uid_main_exist = UIDMainUser.objects.filter(UID=UID).values('UID', 'userID__userID', 'userID__username')
+                uid_main_exist = UIDMainUser.objects.filter(UID=UID).values('UID', 'user_id')
                 if uid_main_exist.exists():
-                    vodPrimaryUserID = uid_main_exist[0]['userID__userID']
-                    vodPrimaryMaster = uid_main_exist[0]['userID__username']
+                    vodPrimaryUserID = uid_main_exist[0]['user_id']
+                    vodPrimaryMaster = Device_User.objects.get(userID = vodPrimaryUserID).username
 
                 is_bind = Device_Info.objects.filter(UID=UID, isShare=False).values('userID__userID', 'vodPrimaryUserID')
                 # 判断是否有已绑定用户

Controller/EquipmentManagerV3.py

@@ -107,10 +107,10 @@ class EquipmentManagerV3(View):
                         vodPrimaryUserID = main_exist[0]['vodPrimaryUserID']
                         vodPrimaryMaster = main_exist[0]['vodPrimaryMaster']
 
-                    uid_main_exist = UIDMainUser.objects.filter(UID=UID).values('UID','userID__userID','userID__username')
+                    uid_main_exist = UIDMainUser.objects.filter(UID=UID).values('UID', 'user_id')
                     if uid_main_exist.exists():
-                        vodPrimaryUserID = uid_main_exist[0]['userID__userID']
-                        vodPrimaryMaster = uid_main_exist[0]['userID__username']
+                        vodPrimaryUserID = uid_main_exist[0]['user_id']
+                        vodPrimaryMaster = Device_User.objects.get(userID=vodPrimaryUserID).username
 
                     is_bind = Device_Info.objects.filter(UID=UID, isShare=False).values('userID__userID', 'vodPrimaryUserID')
                     isvodPrimaryUserID = ''

Model/models.py

@@ -1553,7 +1553,7 @@ class iotdeviceInfoModel(models.Model):
 class UIDMainUser(models.Model):
     id = models.AutoField(primary_key=True)
     UID = models.CharField(blank=True, max_length=32, verbose_name=u'设备UID', default='')
-    userID = models.ForeignKey(Device_User, blank=True, to_field='userID', on_delete=models.CASCADE)
+    user_id = models.CharField(blank=True, max_length=32, verbose_name=u'用户ID', default='')
     class Meta:
         db_table = 'uid_mainuser'
         verbose_name = '设备主用户表'