github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-07-18 17:01:31 +00:00
Code Issues Projects Releases Wiki Activity

fix: 解决冲突

Browse Source
This commit is contained in:
Bai 2024-02-29 16:37:10 +08:00
commit f10114c9ed
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/jumpserver/api.py
View File

@ -182,14 +182,14 @@ class DatesLoginMetricMixin:
def get_dates_login_times_assets(self): def get_dates_login_times_assets(self):
assets = self.sessions_queryset.values("asset") \ assets = self.sessions_queryset.values("asset") \
.annotate(total=Count("asset")) \ .annotate(total=Count("asset", distinct=True)) \
.annotate(last=Cast(Max("date_start"), output_field=CharField())) \ .annotate(last=Cast(Max("date_start"), output_field=CharField())) \
.order_by("-total") .order_by("-total")
return list(assets[:10]) return list(assets[:10])
def get_dates_login_times_users(self): def get_dates_login_times_users(self):
users = self.sessions_queryset.values("user_id") \ users = self.sessions_queryset.values("user_id") \
.annotate(total=Count("user_id")) \ .annotate(total=Count("user_id", distinct=True)) \
.annotate(user=Max('user')) \ .annotate(user=Max('user')) \
.annotate(last=Cast(Max("date_start"), output_field=CharField())) \ .annotate(last=Cast(Max("date_start"), output_field=CharField())) \
.order_by("-total") .order_by("-total")