From 89ba354c539bc573f96e1142a2ffd47499aa4164 Mon Sep 17 00:00:00 2001 From: durant <826035498@qq.com> Date: Thu, 13 Feb 2025 17:20:05 +0800 Subject: [PATCH] =?UTF-8?q?feat(backend):=20=E5=91=8A=E8=AD=A6=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E5=88=97=E8=A1=A8=E5=A4=84=E7=90=86=20#9303?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dbm-ui/backend/db_monitor/serializers.py | 10 +++++++--- dbm-ui/backend/db_monitor/views/event.py | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dbm-ui/backend/db_monitor/serializers.py b/dbm-ui/backend/db_monitor/serializers.py index 25f916a3ea..d506d83142 100644 --- a/dbm-ui/backend/db_monitor/serializers.py +++ b/dbm-ui/backend/db_monitor/serializers.py @@ -290,17 +290,21 @@ class ListAlertSerializer(serializers.Serializer): severity = serializers.ChoiceField(help_text=_("告警级别"), choices=AlertLevelEnum.get_choices(), required=False) stage = serializers.ChoiceField(help_text=_("处理阶段"), choices=AlertStageEnum.get_choices(), required=False) status = serializers.ChoiceField(help_text=_("状态"), choices=AlertStatusEnum.get_choices(), required=False) - page = serializers.IntegerField(help_text=_("页码"), default=1) - page_size = serializers.IntegerField(help_text=_("每页数量"), default=100) + offset = serializers.IntegerField(help_text=_("分页偏移量"), default=0) + limit = serializers.IntegerField(help_text=_("每页数量"), default=100) start_time = serializers.DateTimeField(help_text=_("开始时间")) end_time = serializers.DateTimeField(help_text=_("结束时间")) class Meta: swagger_schema_fields = { "example": { - "bk_biz_id": 101068, + "bk_biz_id": 3, "self_manage": True, "self_assist": False, + "offset": 0, + "limit": 10, + "stage": "is_handled", + "status": "ABNORMAL", "start_time": None, "end_time": None, } diff --git a/dbm-ui/backend/db_monitor/views/event.py b/dbm-ui/backend/db_monitor/views/event.py index fe5228d22a..fcefa46cc7 100644 --- a/dbm-ui/backend/db_monitor/views/event.py +++ b/dbm-ui/backend/db_monitor/views/event.py @@ -53,6 +53,7 @@ def search(self, request): for key, target_key in filter_key_map.items(): if key in params: conditions.append(f"{target_key}: {params[key]}") + del params[key] # 查询用户管理的告警事件,查出用户管理的业务,添加到查询条件中 self_manage = params.pop("self_manage")