Skip to content

fix: Homepage monitoring data statistics error #6124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shaohuzhang1 merged 1 commit into from
May 27, 2026
Merged

fix: Homepage monitoring data statistics error #6124

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 21 additions & 15 deletions apps/homepage/serializers/homepage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,18 @@ def is_workspace_manage(auth, workspace_id):
return RoleConstants.WORKSPACE_MANAGE.value.__str__() + ":/WORKSPACE/" + workspace_id in auth.role_list


def get_format_time(date_time):
def get_start_time(date_time):
d = datetime.datetime.strptime(date_time, '%Y-%m-%d').date()
naive = datetime.datetime.combine(d, datetime.time.min)
return timezone.make_aware(naive, timezone.get_default_timezone())


def get_end_time(date_time):
d = datetime.datetime.strptime(date_time, '%Y-%m-%d').date()
naive = datetime.datetime.combine(d, datetime.time.max)
return timezone.make_aware(naive, timezone.get_default_timezone())


class HomePageSerializer(serializers.Serializer):
class ChatRecordAggregation(serializers.Serializer):
workspace_id = serializers.CharField(required=False, label=_("Workspace ID"))
Expand All @@ -67,8 +73,8 @@ def aggregation(self, auth, with_valid=True):
data = self.validated_data
user_id = data["user_id"]
workspace_id = data.get("workspace_id")
start_time = get_format_time(data["start_time"])
end_time = get_format_time(data["end_time"])
start_time = get_start_time(data["start_time"])
end_time = get_end_time(data["end_time"])
workspace_manage = is_workspace_manage(auth, workspace_id)
query = ChatRecord.objects.filter(
create_time__gte=start_time,
Expand Down Expand Up @@ -121,8 +127,8 @@ def aggregation(self, auth, with_valid=True):
data = self.data
user_id = data["user_id"]
workspace_id = data.get("workspace_id")
start_time = get_format_time(data["start_time"])
end_time = get_format_time(data["end_time"])
start_time = get_start_time(data["start_time"])
end_time = get_end_time(data["end_time"])
workspace_manage = is_workspace_manage(auth, workspace_id)
query = ChatRecord.objects.filter(
create_time__gte=start_time,
Expand Down Expand Up @@ -178,8 +184,8 @@ class ApplicationUserTokenRanking(serializers.Serializer):
def get_queryset(self, auth):
workspace_id = self.data.get("workspace_id")
user_id = self.data.get("user_id")
start_time = get_format_time(self.data.get("start_time"))
end_time = get_format_time(self.data.get("end_time"))
start_time = get_start_time(self.data.get("start_time"))
end_time = get_end_time(self.data.get("end_time"))
name = self.data.get("name")

# ---- 基础查询：不再按 Chat.create_time 过滤 ----
Expand Down Expand Up @@ -332,8 +338,8 @@ def get_queryset(self, auth):
workspace_id = self.data.get("workspace_id")
user_id = self.data.get("user_id")
name = self.data.get("name")
start_time = get_format_time(self.data.get("start_time"))
end_time = get_format_time(self.data.get("end_time"))
start_time = get_start_time(self.data.get("start_time"))
end_time = get_end_time(self.data.get("end_time"))
queryset = Application.objects.filter(workspace_id=workspace_id)
if name:
queryset = queryset.filter(name__contains=name)
Expand Down Expand Up @@ -435,8 +441,8 @@ class ApplicationTokensRanking(serializers.Serializer):
end_time = serializers.DateField(format='%Y-%m-%d', label=_("End time"))

def get_queryset(self, auth):
start_time = get_format_time(self.data.get('start_time'))
end_time = get_format_time(self.data.get('end_time'))
start_time = get_start_time(self.data.get('start_time'))
end_time = get_end_time(self.data.get('end_time'))
name = self.data.get("name")
workspace_id = self.data.get("workspace_id")
user_id = self.data.get("user_id")
Expand Down Expand Up @@ -551,8 +557,8 @@ class ApplicationMonitoring(serializers.Serializer):
def get_customer_count_trend(self, application_queryset, with_valid=True):
if with_valid:
self.is_valid(raise_exception=True)
start_time = get_format_time(self.data.get("start_time"))
end_time = get_format_time(self.data.get("end_time"))
start_time = get_start_time(self.data.get("start_time"))
end_time = get_end_time(self.data.get("end_time"))
query_set = QuerySet(ApplicationChatUserStats).filter(
create_time__gte=start_time,
create_time__lte=end_time)
Expand All @@ -571,8 +577,8 @@ def get_chat_record_aggregate_trend(self, auth, with_valid=True):
self.is_valid(raise_exception=True)
user_id = self.data.get("user_id")
workspace_id = self.data.get("workspace_id")
start_time = get_format_time(self.data.get("start_time"))
end_time = get_format_time(self.data.get("end_time"))
start_time = get_start_time(self.data.get("start_time"))
end_time = get_end_time(self.data.get("end_time"))
application_id = self.data.get('application_id')
applicationSerializer = HomePageSerializer.Application(
data={"user_id": user_id, 'workspace_id': workspace_id})
Expand Down
Loading