github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

【仪表盘】在线用户数不对，（连上windows资产之后，在线用户数就不对了）

pull/6032/head
fghbng@qq.com 2021-04-25 14:58:06 +08:00
parent ce8143c2ec
commit c4727e1eba
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/jumpserver/api.py
View File

@ -99,7 +99,7 @@ class DatesLoginMetricMixin:
if count is not None: if count is not None:
return count return count
ds, de = self.get_date_start_2_end(date) ds, de = self.get_date_start_2_end(date)
count = len(set(Session.objects.filter(date_start__range=(ds, de)).values_list('user', flat=True))) count = len(set(Session.objects.filter(date_start__range=(ds, de)).values_list('user_id', flat=True)))
self.__set_data_to_cache(date, tp, count) self.__set_data_to_cache(date, tp, count)
return count return count
@ -129,7 +129,7 @@ class DatesLoginMetricMixin:
@lazyproperty @lazyproperty
def dates_total_count_active_users(self): def dates_total_count_active_users(self):
count = len(set(self.sessions_queryset.values_list('user', flat=True))) count = len(set(self.sessions_queryset.values_list('user_id', flat=True)))
return count return count
@lazyproperty @lazyproperty
@ -164,7 +164,7 @@ class DatesLoginMetricMixin:
# 以下是从week中而来 # 以下是从week中而来
def get_dates_login_times_top5_users(self): def get_dates_login_times_top5_users(self):
users = self.sessions_queryset.values_list('user', flat=True) users = self.sessions_queryset.values_list('user_id', flat=True)
users = [ users = [
{'user': user, 'total': total} {'user': user, 'total': total}
for user, total in Counter(users).most_common(5) for user, total in Counter(users).most_common(5)
@ -172,7 +172,7 @@ class DatesLoginMetricMixin:
return users return users
def get_dates_total_count_login_users(self): def get_dates_total_count_login_users(self):
return len(set(self.sessions_queryset.values_list('user', flat=True))) return len(set(self.sessions_queryset.values_list('user_id', flat=True)))
def get_dates_total_count_login_times(self): def get_dates_total_count_login_times(self):
return self.sessions_queryset.count() return self.sessions_queryset.count()
@ -186,8 +186,8 @@ class DatesLoginMetricMixin:
return list(assets) return list(assets)
def get_dates_login_times_top10_users(self): def get_dates_login_times_top10_users(self):
users = self.sessions_queryset.values("user") \ users = self.sessions_queryset.values("user_id") \
.annotate(total=Count("user")) \ .annotate(total=Count("user_id")) \
.annotate(last=Max("date_start")).order_by("-total")[:10] .annotate(last=Max("date_start")).order_by("-total")[:10]
for user in users: for user in users:
user['last'] = str(user['last']) user['last'] = str(user['last'])
@ -221,7 +221,7 @@ class TotalCountMixin:
@staticmethod @staticmethod
def get_total_count_online_users(): def get_total_count_online_users():
count = len(set(Session.objects.filter(is_finished=False).values_list('user', flat=True))) count = len(set(Session.objects.filter(is_finished=False).values_list('user_id', flat=True)))
return count return count
@staticmethod @staticmethod