Fix loglist

internal/service/log_service.go

@@ -1,3 +1,4 @@
+// Filename: internal/service/log_service.go
 package service
 
 import (
@@ -16,28 +17,35 @@ func NewLogService(db *gorm.DB) *LogService {
 	return &LogService{db: db}
 }
 
-// Record 记录一条日志到数据库 (TODO 暂时保留简单实现，后续再重构为异步)
 func (s *LogService) Record(log *models.RequestLog) error {
 	return s.db.Create(log).Error
 }
 
-func (s *LogService) GetLogs(c *gin.Context) ([]models.RequestLog, error) {
+func (s *LogService) GetLogs(c *gin.Context) ([]models.RequestLog, int64, error) {
 	var logs []models.RequestLog
+	var total int64
 
-	query := s.db.Model(&models.RequestLog{}).Scopes(s.filtersScope(c)).Order("request_time desc")
+	query := s.db.Model(&models.RequestLog{}).Scopes(s.filtersScope(c))
 
-	// 简单的分页 ( TODO 后续可以做得更复杂)
+	// 先计算总数
+	if err := query.Count(&total).Error; err != nil {
+		return nil, 0, err
+	}
+	if total == 0 {
+		return []models.RequestLog{}, 0, nil
+	}
+
+	// 再执行分页查询
 	page, _ := strconv.Atoi(c.DefaultQuery("page", "1"))
 	pageSize, _ := strconv.Atoi(c.DefaultQuery("page_size", "20"))
 	offset := (page - 1) * pageSize
 
-	// 执行查询
-	err := query.Limit(pageSize).Offset(offset).Find(&logs).Error
+	err := query.Order("request_time desc").Limit(pageSize).Offset(offset).Find(&logs).Error
 	if err != nil {
-		return nil, err
+		return nil, 0, err
 	}
 
-	return logs, nil
+	return logs, total, nil
 }
 
 func (s *LogService) filtersScope(c *gin.Context) func(db *gorm.DB) *gorm.DB {
@@ -60,6 +68,11 @@ func (s *LogService) filtersScope(c *gin.Context) func(db *gorm.DB) *gorm.DB {
 				db = db.Where("key_id = ?", keyID)
 			}
 		}
+		if groupIDStr := c.Query("group_id"); groupIDStr != "" {
+			if groupID, err := strconv.ParseUint(groupIDStr, 10, 64); err == nil {
+				db = db.Where("group_id = ?", groupID)
+			}
+		}
 		return db
 	}
 }