zcdsj
/
cma_search
mirror of https://e.coding.net/ctcdevteam/cma_search.git
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search

This commit is contained in:
shilixia 2021-07-09 11:23:39 +08:00
parent 91d6da4411 c5d44ffcf6
commit a6dcd80682
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/views/system/user.vue
View File

@ -45,7 +45,6 @@
<el-select <el-select
v-model="listQuery.roles" v-model="listQuery.roles"
placeholder="角色" placeholder="角色"
clearable
style="width: 90px" style="width: 90px"
class="filter-item" class="filter-item"
@change="handleFilter" @change="handleFilter"

11
server/apps/vod/views.py
View File

@ -94,11 +94,18 @@ class MyViewRecordAPIView(APIView):
video = Video.objects.get(pk=id) video = Video.objects.get(pk=id)
except: except:
return Response('视频不存在', status=HTTP_400_BAD_REQUEST) return Response('视频不存在', status=HTTP_400_BAD_REQUEST)
record, _ = ViewRecord.objects.get_or_create(video=video, user=request.user, defaults={'video':video, 'user':request.user}) record, fcreated = ViewRecord.objects.get_or_create(video=video, user=request.user, defaults={'video':video, 'user':request.user})
if fcreated:
video.viewsp = video.viewsp + 1
video.views = video.views + 1
record.views = 1
video.save()
if request.data.get('current', None): if request.data.get('current', None):
record.current = request.data.get('current') record.current = request.data.get('current')
if timezone.now() > record.update_time + timedelta(hours=6) or record.create_time == record.update_time: if timezone.now() > record.update_time + timedelta(hours=6):
record.views = record.views + 1 record.views = record.views + 1
video.views = video.views + 1
video.save()
record.save() record.save()
return Response() return Response()