From 27daddcb72c6cac2c93bc05d804dec5ae0397274 Mon Sep 17 00:00:00 2001 From: UlricQin Date: Sun, 18 Jul 2021 16:16:57 +0800 Subject: [PATCH] bugfix: query alert event --- models/alert_event.go | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/models/alert_event.go b/models/alert_event.go index 703f03c7..1f4bde6b 100644 --- a/models/alert_event.go +++ b/models/alert_event.go @@ -182,9 +182,11 @@ func AlertEventTotal(stime, etime int64, query string, status, priority int) (nu } if query != "" { - cond = cond.And(builder.Like{"res_classpaths", "%" + query + "%"}) - cond = cond.And(builder.Like{"rule_name", "%" + query + "%"}) - cond = cond.And(builder.Like{"tags", "%" + query + "%"}) + arr := strings.Fields(query) + for i := 0; i < len(arr); i++ { + qarg := "%" + arr[i] + "%" + cond = cond.And(cond.Or(builder.Like{"res_classpaths", qarg}, builder.Like{"rule_name", qarg}, builder.Like{"tags", qarg})) + } } num, err = DB.Where(cond).Count(new(AlertEvent)) @@ -211,9 +213,11 @@ func AlertEventGets(stime, etime int64, query string, status, priority int, limi } if query != "" { - cond = cond.And(builder.Like{"res_classpaths", "%" + query + "%"}) - cond = cond.And(builder.Like{"rule_name", "%" + query + "%"}) - cond = cond.And(builder.Like{"tags", "%" + query + "%"}) + arr := strings.Fields(query) + for i := 0; i < len(arr); i++ { + qarg := "%" + arr[i] + "%" + cond = cond.And(cond.Or(builder.Like{"res_classpaths", qarg}, builder.Like{"rule_name", qarg}, builder.Like{"tags", qarg})) + } } var objs []AlertEvent