云存主次用户 新增字段

Controller/CloudStorage.py

@@ -474,11 +474,11 @@ class CloudStorageView(View):
         uid = request_dict.get('uid', None)
         channel = request_dict.get('channel', None)
 
-        dv_qs = Device_Info.objects.filter(userID_id=userID, UID=uid, isShare=False).values('primaryUserID',
-                                                                                                       'primaryMaster')
+        dv_qs = Device_Info.objects.filter(userID_id=userID, UID=uid, isShare=False).values('vodPrimaryUserID',
+                                                                                                       'vodPrimaryMaster')
         if not dv_qs.exists():
             return response.json(12)
-        if dv_qs[0]['primaryUserID'] != '' and dv_qs[0]['primaryUserID'] != userID:
+        if dv_qs[0]['vodPrimaryUserID'] != '' and dv_qs[0]['vodPrimaryUserID'] != userID:
             return response.json(10034)
         now_time = int(time.time())
         bv_qs = UID_Bucket.objects.filter(uid=uid,channel=channel, endTime__gte=now_time).order_by('addTime')
@@ -871,11 +871,11 @@ class CloudStorageView(View):
                     (uid=UID, channel=channel, bucket_id=bucketId, endTime=endTime, addTime=nowTime, updateTime=nowTime)
                 uid_bucket_id = ub_cqs.id
 
-            dvq = Device_Info.objects.filter(UID=UID, primaryUserID='', primaryMaster='')
+            dvq = Device_Info.objects.filter(UID=UID, vodPrimaryUserID='', vodPrimaryMaster='')
             if dvq.exists():
                 dvq_set_update_dict = {
-                    'primaryUserID': userid,
-                    'primaryMaster': username
+                    'vodPrimaryUserID': userid,
+                    'vodPrimaryMaster': username
                 }
                 dvq.update(**dvq_set_update_dict)
 
@@ -933,11 +933,11 @@ class CloudStorageView(View):
                 (uid=UID, channel=channel, bucket_id=bucketId, endTime=endTime, addTime=nowTime, updateTime=nowTime)
             uid_bucket_id = ub_cqs.id
 
-        dvq = Device_Info.objects.filter(UID=UID, primaryUserID='', primaryMaster='')
+        dvq = Device_Info.objects.filter(UID=UID, vodPrimaryUserID='', vodPrimaryMaster='')
         if dvq.exists():
             dvq_set_update_dict = {
-                'primaryUserID': userid,
-                'primaryMaster': username
+                'vodPrimaryUserID': userid,
+                'vodPrimaryMaster': username
             }
             dvq.update(**dvq_set_update_dict)
         order_qs.update(status=1, updTime=nowTime, uid_bucket_id=uid_bucket_id)
@@ -987,11 +987,11 @@ class CloudStorageView(View):
                     (uid=UID, channel=channel, bucket_id=bucketId, endTime=endTime, addTime=nowTime, updateTime=nowTime)
                 uid_bucket_id = ub_cqs.id
 
-            dvq = Device_Info.objects.filter(UID=UID, primaryUserID='', primaryMaster='')
+            dvq = Device_Info.objects.filter(UID=UID, vodPrimaryUserID='', vodPrimaryMaster='')
             if dvq.exists():
                 dvq_set_update_dict = {
-                    'primaryUserID': userid,
-                    'primaryMaster': username
+                    'vodPrimaryUserID': userid,
+                    'vodPrimaryMaster': username
                 }
                 dvq.update(**dvq_set_update_dict)
             order_qs.update(status=1, updTime=nowTime, uid_bucket_id=uid_bucket_id)
@@ -1006,18 +1006,24 @@ class CloudStorageView(View):
         is_select_discount = request_dict.get('is_select_discount', 0)
         if not uid or not channel or not pay_type or not rank:
             return response.json(444)
-        dv_qs = Device_Info.objects.filter(userID_id=userID, UID=uid, isShare=False, isExist=1).values('primaryUserID',
-                                                                                                       'primaryMaster')
+        dv_qs = Device_Info.objects.filter(userID_id=userID, UID=uid, isShare=False, isExist=1).values('vodPrimaryUserID',
+                                                                                                       'vodPrimaryMaster')
         if not dv_qs.exists():
             return response.json(12)
 
         dvq = Device_Info.objects.filter(UID=uid)
-        dvq = dvq.filter(~Q(primaryUserID='')).values('primaryUserID')
+        dvq = dvq.filter(~Q(vodPrimaryUserID='')).values('vodPrimaryUserID')
         if dvq.exists():
-            if dvq[0]['primaryUserID'] != userID:
+            if dvq[0]['vodPrimaryUserID'] != userID:
                 return response.json(10033)
 
-        # if dv_qs[0]['primaryUserID'] != '' and dv_qs[0]['primaryUserID'] != userID:
+        nowTime = int(time.time())
+
+        # uq = UID_Bucket.objects.filter(uid=uid,endTime__gt=str(nowTime)).values('endTime')
+        # if uq.exists():
+        #     return response.json(10033)
+
+        # if dv_qs[0]['vodPrimaryUserID'] != '' and dv_qs[0]['vodPrimaryUserID'] != userID:
         #     return response.json(10033)
         smqs = Store_Meal.objects.filter(id=rank, pay_type=pay_type). \
             values('currency', 'price', 'content', 'day',
@@ -1039,7 +1045,7 @@ class CloudStorageView(View):
         #     ubqs_count = ubqs.count()
         #     ubq = ubqs[ubqs_count - 1, ubqs_count]
         #     new_starTime = ubq['endTime'] + 1
-        nowTime = int(time.time())
+
         orderID = CommonService.createOrderID()
         if pay_type == 1:
             call_sub_url = "{SERVER_DOMAIN}cloudstorage/dopaypalcallback?orderID={orderID}". \
@@ -1155,9 +1161,9 @@ class CloudStorageView(View):
             return response.json(13, '参数有误.')
 
         dvq = Device_Info.objects.filter(UID=uid)
-        dvq=dvq.filter(~Q(primaryUserID='')).values('primaryUserID')
+        dvq=dvq.filter(~Q(vodPrimaryUserID='')).values('vodPrimaryUserID')
         if dvq.exists():
-            if dvq[0]['primaryUserID']!=userID:
+            if dvq[0]['vodPrimaryUserID']!=userID:
                 if pay_type==10:
                     return response.json(10035)
                 if pay_type==11:
@@ -1198,11 +1204,11 @@ class CloudStorageView(View):
                                    rank_id=rank,status=1, uid_bucket_id=uid_bucket_id)
 
         duq = Device_User.objects.filter(userID=userID).values('username')
-        dvq = Device_Info.objects.filter(UID=uid, primaryUserID='', primaryMaster='')
+        dvq = Device_Info.objects.filter(UID=uid, vodPrimaryUserID='', vodPrimaryMaster='')
         if dvq.exists():
             dvq_set_update_dict = {
-                'primaryUserID': userID,
-                'primaryMaster': duq[0]['username']
+                'vodPrimaryUserID': userID,
+                'vodPrimaryMaster': duq[0]['username']
             }
             dvq.update(**dvq_set_update_dict)
 
@@ -1252,8 +1258,8 @@ class CloudStorageView(View):
     def deleteVodList(self, request_dict, userID, response):
         uid = request_dict.get('uid',None)
         dv_qs = Device_Info.objects.filter(userID_id=userID, UID=uid, isShare=False, isExist=1) \
-            .values('primaryUserID')
-        if not dv_qs.exists() or dv_qs[0]['primaryUserID'] != userID:
+            .values('vodPrimaryUserID')
+        if not dv_qs.exists() or dv_qs[0]['vodPrimaryUserID'] != userID:
             return response.json(12)
         vod_id_list = json.loads(request_dict.get('vod_id_list', None))
         is_del_all = request_dict.get('is_del_all',0)
@@ -1273,8 +1279,8 @@ class CloudStorageView(View):
     def device_commodity(self, request_dict, userID, response):
         uid = request_dict.get('uid',None)
         dv_qs = Device_Info.objects.filter(userID_id=userID, UID=uid, isShare=False, isExist=1) \
-            .values('primaryUserID')
-        if not dv_qs.exists() or dv_qs[0]['primaryUserID'] != userID:
+            .values('vodPrimaryUserID')
+        if not dv_qs.exists() or dv_qs[0]['vodPrimaryUserID'] != userID:
             return response.json(12)
         now_time = int(time.time())
         uid_bucket = UID_Bucket.objects.filter(uid=uid, endTime__gte=now_time).values("id", "uid", "endTime",
@@ -1291,8 +1297,8 @@ class CloudStorageView(View):
     def switch_device_commodity(self, request_dict, userID, response):
         uid = request_dict.get('uid',None)
         dv_qs = Device_Info.objects.filter(userID_id=userID, UID=uid, isShare=False, isExist=1) \
-            .values('primaryUserID')
-        if not dv_qs.exists() or dv_qs[0]['primaryUserID'] != userID:
+            .values('vodPrimaryUserID')
+        if not dv_qs.exists() or dv_qs[0]['vodPrimaryUserID'] != userID:
             return response.json(12)
         switch_commodity_id = request_dict.get('switch_commodity_id',None)
         if switch_commodity_id:

Controller/CloudTest.py

@@ -75,7 +75,7 @@ class cloudTestView(View):
             # 获取旧设备的username
             oldUserName = Device_User.objects.get(userID=oldUserID).username
             # 更新设备信息
-            old_deviceInfo_qs.update(userID=newUserID, primaryUserID=newUserID, primaryMaster=oldUserName)
+            old_deviceInfo_qs.update(userID=newUserID, vodPrimaryUserID=newUserID, vodPrimaryMaster=oldUserName)
         except Exception as e:
             # print(e)
             return response.json(500, repr(e))

Controller/EquipmentManager.py

@@ -388,17 +388,17 @@ def addInterface(request):
                 # if is_bind:
                 #     return response.json(15)
 
-                main_exist = Device_Info.objects.filter(UID=UID, primaryUserID='',primaryMaster='')
+                main_exist = Device_Info.objects.filter(UID=UID, vodPrimaryUserID='', vodPrimaryMaster='')
                 pk = CommonService.getUserID(getUser=False)
-                primaryMaster = ''
-                primaryUserID = ''
+                vodPrimaryUserID = ''
+                vodPrimaryMaster = ''
                 if not main_exist:
 
                     duq = Device_User.objects.filter(userID=userID).values('username')
                     if duq.exists():
                         username = duq[0]['username']
-                        primaryMaster = username
-                        primaryUserID = userID
+                        vodPrimaryUserID = username
+                        vodPrimaryMaster = userID
 
 
                 try:
@@ -420,7 +420,7 @@ def addInterface(request):
 
                     userDevice = Device_Info(id=pk, userID_id=userID, UID=UID,
                                              NickName=NickName, View_Account=View_Account,
-                                             View_Password=View_Password, Type=Type, ChannelIndex=ChannelIndex, primaryUserID=primaryUserID, primaryMaster=primaryMaster)
+                                             View_Password=View_Password, Type=Type, ChannelIndex=ChannelIndex, vodPrimaryUserID=vodPrimaryUserID, vodPrimaryMaster=vodPrimaryMaster)
                     userDevice.save()
                     # redisObj = RedisObject(db=8)
                     # redisObj.del_data(key='uid_qs_' + userID)
@@ -431,7 +431,7 @@ def addInterface(request):
                                                                     'View_Account',
                                                                     'View_Password', 'ChannelIndex', 'Type',
                                                                     'isShare',
-                                                                    'primaryUserID', 'primaryMaster',
+                                                                    'primaryUserID', 'primaryMaster', 'vodPrimaryUserID', 'vodPrimaryMaster'
                                                                     'data_joined', 'version',
                                                                     'isVod', 'isExist')
                     dvql = CommonService.qs_to_list(dvqs)
@@ -766,7 +766,7 @@ def queryInterface(request):
         # count = dvqs.count()
         dvql = dvqs[(page - 1) * line:page * line].values('id', 'userID', 'NickName', 'UID', 'View_Account',
                                                           'View_Password', 'ChannelIndex', 'Type', 'isShare',
-                                                          'primaryUserID', 'primaryMaster', 'data_joined', 'version',
+                                                          'primaryUserID', 'primaryMaster', 'data_joined', 'version', 'vodPrimaryUserID', 'vodPrimaryMaster'
                                                           'isVod', 'isExist', 'NotificationMode')
         dvls = CommonService.qs_to_list(dvql)
         uid_list = []

Controller/EquipmentManagerV3.py

@@ -89,17 +89,17 @@ class EquipmentManagerV3(View):
                     # if is_bind:
                     #     return response.json(15)
 
-                    main_exist = Device_Info.objects.filter(UID=UID, primaryUserID='', primaryMaster='')
+                    main_exist = Device_Info.objects.filter(UID=UID, vodPrimaryUserID='', vodPrimaryMaster='')
                     pk = CommonService.getUserID(getUser=False)
-                    primaryMaster = ''
-                    primaryUserID = ''
+                    vodPrimaryUserID = ''
+                    vodPrimaryMaster = ''
                     if not main_exist:
 
                         duq = Device_User.objects.filter(userID=userID).values('username')
                         if duq.exists():
                             username = duq[0]['username']
-                            primaryMaster = username
-                            primaryUserID = userID
+                            vodPrimaryUserID = username
+                            vodPrimaryMaster = userID
                     try:
                         # 判断是否有用户绑定
                         nowTime = int(time.time())
@@ -119,7 +119,7 @@ class EquipmentManagerV3(View):
 
                         userDevice = Device_Info(id=pk, userID_id=userID, UID=UID,
                                                  NickName=NickName, View_Account=View_Account,
-                                                 View_Password=View_Password, Type=Type, ChannelIndex=ChannelIndex, primaryUserID=primaryUserID, primaryMaster=primaryMaster)
+                                                 View_Password=View_Password, Type=Type, ChannelIndex=ChannelIndex, vodPrimaryUserID=vodPrimaryUserID, vodPrimaryMaster=vodPrimaryMaster)
                         userDevice.save()
 
                         if not us_qs.exists():
@@ -138,7 +138,7 @@ class EquipmentManagerV3(View):
                                                                         'View_Account',
                                                                         'View_Password', 'ChannelIndex', 'Type',
                                                                         'isShare',
-                                                                        'primaryUserID', 'primaryMaster',
+                                                                        'primaryUserID', 'primaryMaster', 'vodPrimaryUserID', 'vodPrimaryMaster'
                                                                         'data_joined', 'version',
                                                                         'isVod', 'isExist')
                         dvql = CommonService.qs_to_list(dvqs)
@@ -247,7 +247,7 @@ class EquipmentManagerV3(View):
             dvqs = dvqs.filter(~Q(isExist=2))
             dvql = dvqs.values('id', 'userID', 'NickName', 'UID', 'View_Account',
                                'View_Password', 'ChannelIndex', 'Type', 'isShare',
-                               'primaryUserID', 'primaryMaster', 'data_joined',
+                               'primaryUserID', 'primaryMaster', 'data_joined',  'vodPrimaryUserID', 'vodPrimaryMaster'
                                'version', 'isVod', 'isExist', 'NotificationMode')
             dvls = CommonService.qs_to_list(dvql)
             uid_list = []
@@ -406,7 +406,7 @@ class EquipmentManagerV3(View):
 
                 device_qs = device_qs.values('id', 'userID', 'NickName', 'UID', 'View_Account',
                                'View_Password', 'ChannelIndex', 'Type', 'isShare',
-                               'primaryUserID', 'primaryMaster', 'data_joined',
+                               'primaryUserID', 'primaryMaster', 'data_joined',  'vodPrimaryUserID', 'vodPrimaryMaster'
                                'version', 'isVod', 'isExist', 'NotificationMode')
 
                 dvls = CommonService.qs_to_list(device_qs)

Model/models.py

@@ -228,6 +228,8 @@ class Device_Info(models.Model):
                                   help_text=u'是否为共享获取的设备', default=False)
     primaryUserID = models.CharField(blank=True, verbose_name='主用户id', max_length=32, default='')
     primaryMaster = models.CharField(max_length=64, verbose_name=u'主用户名', default='')
+    vodPrimaryUserID = models.CharField(blank=True, verbose_name='云存主用户id', max_length=32, default='')
+    vodPrimaryMaster = models.CharField(max_length=64, verbose_name=u'云存主用户名', default='')
     data_joined = models.DateTimeField(blank=True, verbose_name=u'设备添加时间', auto_now_add=True)
     update_time = models.DateTimeField(blank=True, verbose_name=u'更新时间', auto_now=True, null=True)