From 2b7743547bc482b2ad30c92c5454a47377d50a47 Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Wed, 23 Dec 2020 11:56:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=8C=BA=E5=88=86=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=92=8C=E7=AE=A1=E7=90=86=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/db/models/log_dao.go | 20 ++++++++++++++++++-- internal/rpc/services/service_log.go | 4 ++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/internal/db/models/log_dao.go b/internal/db/models/log_dao.go index 5c101962..2d33e21d 100644 --- a/internal/db/models/log_dao.go +++ b/internal/db/models/log_dao.go @@ -58,7 +58,7 @@ func (this *LogDAO) CreateLog(adminType string, adminId int64, level string, des } // 计算所有日志数量 -func (this *LogDAO) CountLogs(dayFrom string, dayTo string, keyword string) (int64, error) { +func (this *LogDAO) CountLogs(dayFrom string, dayTo string, keyword string, userType string) (int64, error) { dayFrom = this.formatDay(dayFrom) dayTo = this.formatDay(dayTo) @@ -75,11 +75,19 @@ func (this *LogDAO) CountLogs(dayFrom string, dayTo string, keyword string) (int Param("keyword", "%"+keyword+"%") } + // 用户类型 + switch userType { + case "admin": + query.Where("adminId>0") + case "user": + query.Where("userId>0") + } + return query.Count() } // 列出单页日志 -func (this *LogDAO) ListLogs(offset int64, size int64, dayFrom string, dayTo string, keyword string) (result []*Log, err error) { +func (this *LogDAO) ListLogs(offset int64, size int64, dayFrom string, dayTo string, keyword string, userType string) (result []*Log, err error) { dayFrom = this.formatDay(dayFrom) dayTo = this.formatDay(dayTo) @@ -95,6 +103,14 @@ func (this *LogDAO) ListLogs(offset int64, size int64, dayFrom string, dayTo str Param("keyword", "%"+keyword+"%") } + // 用户类型 + switch userType { + case "admin": + query.Where("adminId>0") + case "user": + query.Where("userId>0") + } + _, err = query. Offset(offset). Limit(size). diff --git a/internal/rpc/services/service_log.go b/internal/rpc/services/service_log.go index a99939cb..15f8abb0 100644 --- a/internal/rpc/services/service_log.go +++ b/internal/rpc/services/service_log.go @@ -35,7 +35,7 @@ func (this *LogService) CountLogs(ctx context.Context, req *pb.CountLogRequest) return nil, err } - count, err := models.SharedLogDAO.CountLogs(req.DayFrom, req.DayTo, req.Keyword) + count, err := models.SharedLogDAO.CountLogs(req.DayFrom, req.DayTo, req.Keyword, req.UserType) if err != nil { return nil, err } @@ -50,7 +50,7 @@ func (this *LogService) ListLogs(ctx context.Context, req *pb.ListLogsRequest) ( return nil, err } - logs, err := models.SharedLogDAO.ListLogs(req.Offset, req.Size, req.DayFrom, req.DayTo, req.Keyword) + logs, err := models.SharedLogDAO.ListLogs(req.Offset, req.Size, req.DayFrom, req.DayTo, req.Keyword, req.UserType) if err != nil { return nil, err }