a

Controller/CloudStorage.py

@@ -36,7 +36,6 @@ from Service.CommonService import CommonService
 from Service.ModelService import ModelService
 from Object.ETkObject import ETkObject
 
-
 SERVER_DOMAIN = 'http://cloudstroage.dvema.com/'
 
 
@@ -74,10 +73,12 @@ class CloudStorageView(View):
             if tko.code != 0:
                 return response.json(tko.code)
             userID = tko.userID
-            if operation == 'createPayOrder':
+            if operation == 'createpayorder':
                 return self.do_create_pay_order(request_dict, userID, response)
             elif operation == 'changevodstatus':
                 return self.do_change_vod_status(request_dict, userID, response)
+            elif operation == 'queryvodlist':
+                return self.do_query_vod_list(request_dict, userID, response)
             else:
                 return response.json(414)
 
@@ -221,13 +222,24 @@ class CloudStorageView(View):
                 if sts_qs.exists():
                     sts_qs.update(data=json.dumps(res), addTime=now_time)
                 else:
-                    StsCrdModel.objects.create(uid=uid, channel=channel, data=json.dumps(res), addTime=now_time,type=1)
+                    StsCrdModel.objects.create(uid=uid, channel=channel, data=json.dumps(res), addTime=now_time, type=1)
                 return JsonResponse(status=200, data=res)
             else:
                 res = {'code': 404, 'msg': 'data not exists!'}
                 return HttpResponse(json.dumps(res, ensure_ascii=False),
                                     content_type="application/json,charset=utf-8")
 
+    def do_query_vod_list(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)
+        dv_qs = Device_Info.objects.filter(UID=uid,userID_id=userID,isShare=False)
+        if not dv_qs.exists():
+            return response.json(12)
+        now_time = int(time.time())
+        vh_qs = VodHlsModel.objects.filter(uid=uid,channel=channel,time__range=(startTime,endTime))
+
     def do_store_playlist(self, request_dict, response):
         uidToken = request_dict.get('uidToken', None)
         storeTime = request_dict.get('time', None)
@@ -247,12 +259,12 @@ class CloudStorageView(View):
         print(channel)
         now_time = int(time.time())
         ubqs = UID_Bucket.objects.filter(uid=UID, channel=channel, endTime__gte=now_time). \
-            values("bucket__mold", "bucket__bucket", "bucket__endpoint", "bucket__region", "status","bucket__storeDay")
+            values("bucket__mold", "bucket__bucket", "bucket__endpoint", "bucket__region", "status", "bucket__storeDay")
         if ubqs.exists():
             ub_qs_data = ubqs[0]
             store_day = ub_qs_data['bucket__storeDay']
             bucket_id = ub_qs_data['bucket_id']
-            end_time = int(storeTime)+store_day*86400
+            end_time = int(storeTime) + store_day * 86400
             if ub_qs_data['status'] == 1:
                 if ub_qs_data["bucket__mold"] == 0:
                     oss_crd_qs = OssCrdModel.objects.filter(uid=UID, channel=channel)
@@ -264,12 +276,15 @@ class CloudStorageView(View):
                             endTime=end_time,
                             bucket_id=bucket_id
                         )
-                        return response.json(0)
+                        res = {'code': 0, 'msg': '存储成功'}
+                        return HttpResponse(json.dumps(res, ensure_ascii=False),
+                                            content_type="application/json,charset=utf-8")
                     else:
                         res = {'code': 404, 'msg': '设备未购买'}
-                        return HttpResponse(json.dumps(res, ensure_ascii=False), content_type="application/json,charset=utf-8")
+                        return HttpResponse(json.dumps(res, ensure_ascii=False),
+                                            content_type="application/json,charset=utf-8")
                 elif ub_qs_data['bucket__mold'] == 1:
-                    sts_qs = StsCrdModel.objects.filter(uid=UID, channel=channel,type=1). \
+                    sts_qs = StsCrdModel.objects.filter(uid=UID, channel=channel, type=1). \
                         values("addTime", "data")
                     if sts_qs.exists():
                         VodHlsModel.objects.create(
@@ -277,12 +292,16 @@ class CloudStorageView(View):
                             channel=channel,
                             time=storeTime,
                             endTime=end_time,
-                            bucket_id=bucket_id
+                            bucket_id=bucket_id,
+                            fg=fg,
                         )
-                        return response.json(0)
+                        res = {'code': 0, 'msg': '存储成功'}
+                        return HttpResponse(json.dumps(res, ensure_ascii=False),
+                                            content_type="application/json,charset=utf-8")
                     else:
                         res = {'code': 404, 'msg': '设备未购买'}
-                        return HttpResponse(json.dumps(res, ensure_ascii=False), content_type="application/json,charset=utf-8")
+                        return HttpResponse(json.dumps(res, ensure_ascii=False),
+                                            content_type="application/json,charset=utf-8")
             else:
                 res = {'code': 404, 'msg': '设备未开启'}
                 return HttpResponse(json.dumps(res, ensure_ascii=False), content_type="application/json,charset=utf-8")