节点日志可以使用标签筛选/级别可以填写多个,用逗号分隔

This commit is contained in:
刘祥超
2022-01-03 11:04:14 +08:00
parent 75e41fff4d
commit 7e9e764322
2 changed files with 17 additions and 4 deletions

View File

@@ -142,7 +142,8 @@ func (this *NodeLogDAO) CountNodeLogs(tx *dbs.Tx,
dayTo string,
keyword string,
level string,
isUnread bool) (int64, error) {
isUnread bool,
tag string) (int64, error) {
query := this.Query(tx)
if len(role) > 0 {
query.Attr("role", role)
@@ -181,6 +182,9 @@ func (this *NodeLogDAO) CountNodeLogs(tx *dbs.Tx,
if isUnread {
query.Attr("isRead", 0)
}
if len(tag) > 0 {
query.Like("tag", "%"+tag+"%")
}
return query.Count()
}
@@ -198,6 +202,7 @@ func (this *NodeLogDAO) ListNodeLogs(tx *dbs.Tx,
level string,
fixedState configutils.BoolState,
isUnread bool,
tag string,
offset int64,
size int64) (result []*NodeLog, err error) {
query := this.Query(tx)
@@ -240,11 +245,19 @@ func (this *NodeLogDAO) ListNodeLogs(tx *dbs.Tx,
Param("keyword", "%"+keyword+"%")
}
if len(level) > 0 {
query.Attr("level", level)
var pieces = strings.Split(level, ",")
if len(pieces) == 1 {
query.Attr("level", pieces[0])
} else {
query.Attr("level", pieces)
}
}
if isUnread {
query.Attr("isRead", 0)
}
if len(tag) > 0 {
query.Like("tag", "%"+tag+"%")
}
_, err = query.
Offset(offset).
Limit(size).