gte

Controller/CloudVod.py

@@ -31,6 +31,7 @@ from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 from Object.UidTokenObject import UidTokenObject
 from Service.CommonService import CommonService
+from Service.ModelService import ModelService
 
 '''
 # 获取设备推送hls流 证书
@@ -111,8 +112,6 @@ class CloudVodView(View):
                 return self.do_get_playlist(request_dict, userID, response)
             elif operation == 'details':
                 return self.do_get_details(request_dict, response)
-            elif operation == 'queryVod':
-                return self.do_query_vod(request_dict, userID, response)
             elif operation == 'filterVod':
                 return self.do_filter_playlist(request_dict, userID, response)
             else:
@@ -221,7 +220,7 @@ class CloudVodView(View):
             # 续费流程
         nowTime = int(time.time())
         # 判断是否存在未完成订单
-        hasOrder = Order_Model.objects.filter(UID=uid, channel=channel, addTime__lte=3600 + nowTime, status=0,
+        hasOrder = Order_Model.objects.filter(UID=uid, channel=channel, addTime__gte=nowTime-3600, status=0,
                                               rank_id=rank). \
             values('paypal')
         if hasOrder.exists():
@@ -596,25 +595,22 @@ class CloudVodView(View):
             vod_play_list.append({'name': vod['time'], 'sign_url': vod_play_url, 'thumb': thumb, 'sec': vod['sec']})
         return response.json(0, vod_play_list)
 
-    def do_query_vod(self, request_dict, userID, response):
-        page = request_dict.get('page', None)
-        line = request_dict.get('line', None)
-        did = request_dict.get('did', None)
+    # backend find play list0
+    def do_find_playlist(self, request_dict, userID, response):
+        startTime = int(request_dict.get('startTime', None))
+        endTime = int(request_dict.get('endTime', None))
+        UID = request_dict.get('uid', None)
         channel = request_dict.get('channel', None)
-        dvqs = Device_Info.objects.filter(id=did, userID_id=userID, isShare=False).values("UID")
-        if not dvqs.exists():
-            return response.json(12)
-        UID = dvqs[0]["UID"]
-        ubqs = UID_Bucket.objects.filter(uid=UID, channel=channel).values('status')
-        if not ubqs.exists():
-            return response.json(10, '设备未购买')
+        own_perm = ModelService.check_perm(userID, 20)
+        if own_perm is False:
+            return response.json(404)
         nowTime = int(time.time())
-        vodqs = VodHlsModel.objects.filter(uid=UID, channel=channel, endTime__gte=nowTime) \
+        vodqs = VodHlsModel.objects.filter(uid=UID, channel=channel, time__range=(startTime, endTime),
+                                           endTime__gte=nowTime) \
             .values("time", "sec", "bucket__bucket", "bucket__endpoint", "bucket__region")
         vod_play_list = []
-        page = int(page)
-        line = int(line)
-        for vod in vodqs[(page - 1) * line:page * line]:
+        print(vodqs)
+        for vod in vodqs:
             bucket_name = vod["bucket__bucket"]
             endpoint = vod["bucket__endpoint"]
             auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)