Merge pull request #25 from Cairry/master

[fix]: delete rule tmpl failed, update rule error

controllers/api/rule_template.go

@@ -126,11 +126,12 @@ func (rtc RuleTmplController) Create(ctx *gin.Context) {
 
 func (rtc RuleTmplController) Delete(ctx *gin.Context) {
 
-	ruleName := ctx.Query("ruleName")
-	err := repo.DBCli.Delete(repo.Delete{
-		Table: &models.RuleTemplate{},
-		Where: []interface{}{"rule_name = ?", ruleName},
-	})
+	var r models.RuleTemplate
+	_ = ctx.ShouldBindJSON(&r)
+
+	db := globals.DBCli.Model(&models.RuleTemplate{})
+	db.Where("rule_group_name = ? AND rule_name = ?", r.RuleGroupName, r.RuleName)
+	err := db.Delete(models.RuleTemplate{}).Error
 	if err != nil {
 		response.Fail(ctx, err.Error(), "failed")
 		return

controllers/services/rules.go

@@ -88,18 +88,14 @@ func (rs *RuleService) Update(rule models.AlertRule) error {
 	}
 
 	// 更新数据
-	data := repo.Updates{
-		Table:   models.AlertRule{},
-		Where:   []interface{}{"tenant_id = ? AND rule_id = ?", rule.TenantId, newRule.RuleId},
-		Updates: &newRule,
-	}
-	err := repo.DBCli.Updates(data)
+	db := globals.DBCli.Model(&models.AlertRule{})
+	db.Where("tenant_id = ? AND rule_id = ?", rule.TenantId, rule.RuleId)
+	err := db.Updates(newRule).Error
 	if err != nil {
 		return err
 	}
 
 	return nil
-
 }
 
 func (rs *RuleService) Delete(tid, id string) error {