From c65ba6a3b00131c3e5355d276b072798be5da5bc Mon Sep 17 00:00:00 2001 From: like Date: Wed, 5 Jul 2023 16:51:55 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8C=87=E6=A0=87=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/bean/vo/request/alert_rules.go | 2 +- src/bean/vo/request/metric_config.go | 8 +++++--- src/service/metric_config.go | 6 ++++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/bean/vo/request/alert_rules.go b/src/bean/vo/request/alert_rules.go index a7c5458..388aed6 100644 --- a/src/bean/vo/request/alert_rules.go +++ b/src/bean/vo/request/alert_rules.go @@ -67,7 +67,7 @@ type ListAlertRules struct { // 请输入预警规则名称/预警对象/预警分类/预警指标 Id string `json:"id" form:"id"` NotifyMethod string `json:"notify_method" form:"notify_method" binding:"omitempty,oneof=all dingtalk sms"` // 预警通知方式 all dingtalk sms - IsEnabled int `json:"is_enabled" form:"is_enabled" binding:"omitempty,oneof=0 1 2"` // 是否开启 1:是 2:否 + IsEnabled int `json:"is_enabled" form:"is_enabled" binding:"omitempty,oneof=1 2"` // 是否开启 1:是 2:否 Keyword string `json:"keyword" form:"keyword"` // 预警规则名称(指标名称) StartTime string `json:"start_time" form:"start_time" binding:"omitempty,datetime=2006-01-02 15:04:05"` EndTime string `json:"end_time" form:"end_time" binding:"omitempty,datetime=2006-01-02 15:04:05"` diff --git a/src/bean/vo/request/metric_config.go b/src/bean/vo/request/metric_config.go index 6c070d0..fcdd4fa 100644 --- a/src/bean/vo/request/metric_config.go +++ b/src/bean/vo/request/metric_config.go @@ -10,7 +10,7 @@ type AddMetricConfig struct { Duration int `json:"duration" form:"duration"` // 持续时间 DurationUnit string `json:"duration_unit" form:"duration_unit" binding:"required,oneof=s m h"` // 持续时间单位 s m h CheckPeriod int `json:"check_period" form:"check_period" binding:"oneof=1 3 5 10 20 30"` // 检查周期 单位:分钟 - IsEnabled int `json:"is_enabled" form:"is_enabled" binding:"omitempty,oneof=0 1 2"` // 是否开启 1:是 2:否 + IsEnabled int `json:"is_enabled" form:"is_enabled" binding:"omitempty,oneof=1 2"` // 是否开启 1:是 2:否 AlertRuleType string `json:"alert_rule_type" form:"alert_rule_type" binding:"required"` // 预警规则类型 关联字典表 SourceFrom int `json:"source_from" form:"source_from" binding:"omitempty,oneof=1 2"` // 数据来源 1:默认 2:自定义 } @@ -24,7 +24,7 @@ type UpdateMetricConfig struct { Duration int `json:"duration" form:"duration"` // 持续时间 DurationUnit string `json:"duration_unit" form:"duration_unit" binding:"omitempty,oneof=s m h"` // 持续时间单位 s m h CheckPeriod int `json:"check_period" form:"check_period" binding:"omitempty,oneof=1 3 5 10 20 30"` // 检查周期 单位:分钟 - IsEnabled int `json:"is_enabled" form:"is_enabled" binding:"omitempty,oneof=0 1 2"` // 是否开启 1:是 2:否 + IsEnabled int `json:"is_enabled" form:"is_enabled" binding:"omitempty,oneof=1 2"` // 是否开启 1:是 2:否 AlertRuleType string `json:"alert_rule_type" form:"alert_rule_type"` // 预警规则类型 关联字典表 SourceFrom int `json:"source_from" form:"source_from" binding:"omitempty,oneof=1 2"` // 数据来源 1:默认 2:自定义 } @@ -42,6 +42,8 @@ type ListMetricConfig struct { Id string `json:"id" form:"id"` ClassId int `json:"class_id" form:"class_id"` MetricName string `json:"metric_name" form:"metric_name"` - IsEnabled int `json:"is_enabled" form:"is_enabled" binding:"omitempty,oneof=0 1 2"` + IsEnabled int `json:"is_enabled" form:"is_enabled" binding:"omitempty,oneof=1 2"` + StartTime string `json:"start_time" form:"start_time" binding:"omitempty,datetime=2006-01-02 15:04:05"` + EndTime string `json:"end_time" form:"end_time" binding:"omitempty,datetime=2006-01-02 15:04:05"` Pagination } diff --git a/src/service/metric_config.go b/src/service/metric_config.go index fc266b8..6792a5b 100644 --- a/src/service/metric_config.go +++ b/src/service/metric_config.go @@ -78,6 +78,12 @@ func (m *MetricConfigSvc) List(req request.ListMetricConfig) (resp response.Metr if req.IsEnabled != 0 { session.Where("is_enabled = ?", req.IsEnabled) } + if req.StartTime != "" { + session.Where("created_at >= ?", req.StartTime) + } + if req.EndTime != "" { + session.Where("created_at <= ?", req.EndTime) + } resp.TotalCount, err = session.Limit(req.GetPageSize(), (req.GetPage()-1)*req.GetPageSize()). OrderBy("id").FindAndCount(&resp.List) return -- 2.26.0