From 0e483ac4b0a0c7f237f6ea75fc15ad599eb10646 Mon Sep 17 00:00:00 2001
From: like <like@wodcloud.com>
Date: Fri, 30 Jun 2023 11:16:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8C=87=E6=A0=87=E9=85=8D=E7=BD=AE&?=
 =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=88=86=E7=B1=BB=E6=89=B9=E9=87=8F=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/bean/vo/request/alert_class.go   |  3 ++-
 src/bean/vo/request/metric_config.go |  3 ++-
 src/controller/alert_class.go        |  9 ++++++++-
 src/controller/metric_config.go      | 10 +++++++++-
 src/service/alert_class.go           |  4 ++--
 src/service/metric_config.go         |  4 ++--
 6 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/bean/vo/request/alert_class.go b/src/bean/vo/request/alert_class.go
index 905c265..91c4b53 100644
--- a/src/bean/vo/request/alert_class.go
+++ b/src/bean/vo/request/alert_class.go
@@ -12,7 +12,8 @@ type UpdateAlertClass struct {
 }
 
 type DeleteAlertClass struct {
-	ClassId int `json:"class_id" form:"class_id" binding:"required"`
+	ClassId  int   `json:"class_id" form:"class_id"`
+	ClassIds []int `json:"class_ids" form:"class_ids" binding:"required_without=ClassId"`
 }
 
 type MoveAlertClass struct {
diff --git a/src/bean/vo/request/metric_config.go b/src/bean/vo/request/metric_config.go
index 9421ddd..bf5191f 100644
--- a/src/bean/vo/request/metric_config.go
+++ b/src/bean/vo/request/metric_config.go
@@ -28,7 +28,8 @@ type UpdateMetricConfig struct {
 }
 
 type DeleteMetricConfig struct {
-	Id string `json:"id" form:"id" binding:"required"`
+	Id  string   `json:"id" form:"id"`
+	Ids []string `json:"ids" form:"ids" binding:"required_without=Id"`
 }
 
 type DetailMetricConfig struct {
diff --git a/src/controller/alert_class.go b/src/controller/alert_class.go
index 976d16e..859393f 100644
--- a/src/controller/alert_class.go
+++ b/src/controller/alert_class.go
@@ -111,9 +111,16 @@ func DeleteAlertClass(c *gin.Context) {
 		SendJsonResponse(c, resp.InvalidParam.TranslateError(err), nil)
 		return
 	}
+	var ids []int
+	switch len(req.ClassIds) {
+	case 0:
+		ids = append(ids, req.ClassId)
+	default:
+		ids = req.ClassIds
+	}
 
 	svc := service.AlertClassSvc{User: header.GetUser(c)}
-	err := svc.DeleteDataById(req)
+	err := svc.Delete(ids)
 	if err != nil {
 		SendJsonResponse(c, resp.FAIL.WithError(err), nil)
 		return
diff --git a/src/controller/metric_config.go b/src/controller/metric_config.go
index a0a3a2a..a0a5d83 100644
--- a/src/controller/metric_config.go
+++ b/src/controller/metric_config.go
@@ -48,8 +48,16 @@ func DeleteMetricConfig(c *gin.Context) {
 		return
 	}
 
+	var ids []string
+	switch len(req.Ids) {
+	case 0:
+		ids = append(ids, req.Id)
+	default:
+		ids = req.Ids
+	}
+
 	svc := service.MetricConfigSvc{User: header.GetUser(c)}
-	err := svc.DeleteDataById(req)
+	err := svc.Delete(ids)
 	if err != nil {
 		SendJsonResponse(c, resp.FAIL.WithError(err), nil)
 		return
diff --git a/src/service/alert_class.go b/src/service/alert_class.go
index e819b97..ac987ad 100644
--- a/src/service/alert_class.go
+++ b/src/service/alert_class.go
@@ -218,11 +218,11 @@ func (m *AlertClassSvc) SortOrderMax(parentId int) (max int, err error) {
 	return
 }
 
-func (m *AlertClassSvc) DeleteDataById(req request.DeleteAlertClass) (err error) {
+func (m *AlertClassSvc) Delete(ids []int) (err error) {
 	db, err := client.GetDbClient()
 	if err != nil {
 		return
 	}
-	_, err = db.NewSession().ID(req.ClassId).Delete(&entity.AlertClass{})
+	_, err = db.NewSession().In("class_id", ids).Delete(&entity.AlertClass{})
 	return
 }
diff --git a/src/service/metric_config.go b/src/service/metric_config.go
index 7378597..6961c1c 100644
--- a/src/service/metric_config.go
+++ b/src/service/metric_config.go
@@ -94,11 +94,11 @@ func (m *MetricConfigSvc) List(req request.ListMetricConfig) (resp response.Unit
 	return
 }
 
-func (m *MetricConfigSvc) DeleteDataById(req request.DeleteMetricConfig) (err error) {
+func (m *MetricConfigSvc) Delete(ids []string) (err error) {
 	db, err := client.GetDbClient()
 	if err != nil {
 		return
 	}
-	_, err = db.NewSession().Where("id = ?", req.Id).Delete(&entity.MetricConfig{})
+	_, err = db.NewSession().In("id", ids).Delete(new(entity.MetricConfig))
 	return
 }
-- 
2.26.0