|
@@ -418,9 +418,13 @@ class CloudStorageView(View):
|
|
bv_qs = UID_Bucket.objects.filter(uid=uid, endTime__gte=now_time ,channel=channel).values('bucket_id').order_by('addTime')
|
|
bv_qs = UID_Bucket.objects.filter(uid=uid, endTime__gte=now_time ,channel=channel).values('bucket_id').order_by('addTime')
|
|
if not bv_qs.exists():
|
|
if not bv_qs.exists():
|
|
return response.json(10030)
|
|
return response.json(10030)
|
|
|
|
+ # vh_qs = VodHlsModel.objects.filter \
|
|
|
|
+ # (uid=uid, channel=channel, endTime__gte=now_time,time__range=(startTime, endTime), bucket_id=bv_qs[0]['bucket_id']). \
|
|
|
|
+ # values("id", "time", "sec", "bucket__bucket", "fg", "bucket__endpoint", "bucket__region", "bucket__mold")
|
|
vh_qs = VodHlsModel.objects.filter \
|
|
vh_qs = VodHlsModel.objects.filter \
|
|
- (uid=uid, channel=channel, endTime__gte=now_time,time__range=(startTime, endTime), bucket_id=bv_qs[0]['bucket_id']). \
|
|
|
|
|
|
+ (uid=uid, channel=channel, endTime__gte=now_time, time__range=(startTime, endTime)). \
|
|
values("id", "time", "sec", "bucket__bucket", "fg", "bucket__endpoint", "bucket__region", "bucket__mold")
|
|
values("id", "time", "sec", "bucket__bucket", "fg", "bucket__endpoint", "bucket__region", "bucket__mold")
|
|
|
|
+
|
|
vod_play_list = []
|
|
vod_play_list = []
|
|
if not vh_qs.exists():
|
|
if not vh_qs.exists():
|
|
return response.json(0, vod_play_list)
|
|
return response.json(0, vod_play_list)
|
|
@@ -1512,7 +1516,7 @@ class CloudStorageView(View):
|
|
,updateTime=nowTime,use_status=1, has_unused=has_unused)
|
|
,updateTime=nowTime,use_status=1, has_unused=has_unused)
|
|
Unused_Uid_Meal.objects.filter(id=unused_id).delete()
|
|
Unused_Uid_Meal.objects.filter(id=unused_id).delete()
|
|
StsCrdModel.objects.filter(uid=uid).delete() # 删除sts记录
|
|
StsCrdModel.objects.filter(uid=uid).delete() # 删除sts记录
|
|
- VodHlsModel.objects.filter(uid=uid).delete() # 删除播放列表,后期数据量多时应该考虑延后删除
|
|
|
|
|
|
+ # VodHlsModel.objects.filter(uid=uid).delete() # 删除播放列表,后期数据量多时应该考虑延后删除
|
|
except Exception:
|
|
except Exception:
|
|
return response.json(474)
|
|
return response.json(474)
|
|
return response.json(0)
|
|
return response.json(0)
|
|
@@ -1885,7 +1889,7 @@ def updateUnusedUidBucket(request):
|
|
has_unused=has_unused)
|
|
has_unused=has_unused)
|
|
Unused_Uid_Meal.objects.filter(id=unused['id']).delete()
|
|
Unused_Uid_Meal.objects.filter(id=unused['id']).delete()
|
|
StsCrdModel.objects.filter(uid=expired_uid_bucket['uid']).delete() # 删除sts记录
|
|
StsCrdModel.objects.filter(uid=expired_uid_bucket['uid']).delete() # 删除sts记录
|
|
- VodHlsModel.objects.filter(uid=expired_uid_bucket['uid']).delete() # 删除播放列表,后期数据量多时应该考虑延后删除
|
|
|
|
|
|
+ # VodHlsModel.objects.filter(uid=expired_uid_bucket['uid']).delete() # 删除播放列表,后期数据量多时应该考虑延后删除
|
|
except Exception:
|
|
except Exception:
|
|
continue
|
|
continue
|
|
# UID_Bucket.objects.filter(id__in=list(id_list)).update(use_status=2) # 更新过期云存关联套餐状态
|
|
# UID_Bucket.objects.filter(id__in=list(id_list)).update(use_status=2) # 更新过期云存关联套餐状态
|