From 02ac331ce2a5c69440d25ee081338fc33bf71a4f Mon Sep 17 00:00:00 2001 From: like Date: Wed, 5 Jul 2023 11:14:29 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=8C=E5=96=84=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E8=A7=84=E5=88=99=E8=AE=BE=E7=BD=AE=E5=88=97=E8=A1=A8=E8=BF=94?= =?UTF-8?q?=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/bean/vo/response/alert_rules.go | 1 + src/service/alert_rules.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bean/vo/response/alert_rules.go b/src/bean/vo/response/alert_rules.go index 7724007..c35a6a3 100644 --- a/src/bean/vo/response/alert_rules.go +++ b/src/bean/vo/response/alert_rules.go @@ -4,6 +4,7 @@ import "gitlab.wodcloud.com/smart-operation/so-operation-api/src/bean/entity" type AlertRulesItem struct { entity.AlertRules `xorm:"extends"` + AlertRuleType string `json:"alert_rule_type" xorm:"alert_rule_type"` // 预警规则类型 关联字典表 ClassParentName string `json:"class_parent_name" xorm:"class_parent_name"` ClassName string `json:"class_name" xorm:"class_name"` MetricConfigName string `json:"metric_config_name" xorm:"metric_config_name"` diff --git a/src/service/alert_rules.go b/src/service/alert_rules.go index 4eaef39..9ae340a 100644 --- a/src/service/alert_rules.go +++ b/src/service/alert_rules.go @@ -213,7 +213,7 @@ func (a *AlertRulesSvc) List(req request.ListAlertRules) (resp response.AlertRul } session := db.NewSession() defer session.Close() - session.Table(new(entity.AlertRules)).Alias("r").Select("r.*,acp.class_name class_parent_name,ac.class_name,mc.metric_name metric_config_name") + session.Table(new(entity.AlertRules)).Alias("r").Select("r.*,acp.class_name class_parent_name,ac.class_name,mc.metric_name metric_config_name,mc.alert_rule_type") session.Join("LEFT", "metric_config mc", "mc.id = r.metric_config_id") session.Join("LEFT", "alert_class ac", "ac.class_id = r.class_id") session.Join("LEFT", "alert_class acp", "acp.class_id = ac.parent_id") -- 2.26.0