修改infra.repository包
This commit is contained in:
@@ -1,10 +1,13 @@
|
||||
package repository
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"time"
|
||||
|
||||
"git.huangwc.com/pig/pig-farm-controller/internal/infra/logs"
|
||||
"git.huangwc.com/pig/pig-farm-controller/internal/infra/models"
|
||||
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
@@ -23,38 +26,42 @@ type PigSickLogListOptions struct {
|
||||
// PigSickLogRepository 定义了与病猪日志模型相关的数据库操作接口。
|
||||
type PigSickLogRepository interface {
|
||||
// CreatePigSickLog 创建一条新的病猪日志记录
|
||||
CreatePigSickLog(log *models.PigSickLog) error
|
||||
CreatePigSickLogTx(tx *gorm.DB, log *models.PigSickLog) error
|
||||
CreatePigSickLog(ctx context.Context, log *models.PigSickLog) error
|
||||
CreatePigSickLogTx(ctx context.Context, tx *gorm.DB, log *models.PigSickLog) error
|
||||
|
||||
// GetLastLogByBatchTx 在事务中获取指定批次和猪栏的最新一条 PigSickLog 记录
|
||||
GetLastLogByBatchTx(tx *gorm.DB, batchID uint) (*models.PigSickLog, error)
|
||||
GetLastLogByBatchTx(ctx context.Context, tx *gorm.DB, batchID uint) (*models.PigSickLog, error)
|
||||
|
||||
// ListPigSickLogs 支持分页和过滤的病猪日志列表查询
|
||||
ListPigSickLogs(opts PigSickLogListOptions, page, pageSize int) ([]models.PigSickLog, int64, error)
|
||||
ListPigSickLogs(ctx context.Context, opts PigSickLogListOptions, page, pageSize int) ([]models.PigSickLog, int64, error)
|
||||
}
|
||||
|
||||
// gormPigSickLogRepository 是 PigSickLogRepository 接口的 GORM 实现。
|
||||
type gormPigSickLogRepository struct {
|
||||
db *gorm.DB
|
||||
ctx context.Context
|
||||
db *gorm.DB
|
||||
}
|
||||
|
||||
// NewGormPigSickLogRepository 创建一个新的 PigSickLogRepository GORM 实现实例。
|
||||
func NewGormPigSickLogRepository(db *gorm.DB) PigSickLogRepository {
|
||||
return &gormPigSickLogRepository{db: db}
|
||||
func NewGormPigSickLogRepository(ctx context.Context, db *gorm.DB) PigSickLogRepository {
|
||||
return &gormPigSickLogRepository{ctx: ctx, db: db}
|
||||
}
|
||||
|
||||
// CreatePigSickLog 创建一条新的病猪日志记录
|
||||
func (r *gormPigSickLogRepository) CreatePigSickLog(log *models.PigSickLog) error {
|
||||
return r.CreatePigSickLogTx(r.db, log)
|
||||
func (r *gormPigSickLogRepository) CreatePigSickLog(ctx context.Context, log *models.PigSickLog) error {
|
||||
repoCtx := logs.AddFuncName(ctx, r.ctx, "CreatePigSickLog")
|
||||
return r.CreatePigSickLogTx(repoCtx, r.db, log)
|
||||
}
|
||||
func (r *gormPigSickLogRepository) CreatePigSickLogTx(tx *gorm.DB, log *models.PigSickLog) error {
|
||||
return tx.Create(log).Error
|
||||
func (r *gormPigSickLogRepository) CreatePigSickLogTx(ctx context.Context, tx *gorm.DB, log *models.PigSickLog) error {
|
||||
repoCtx := logs.AddFuncName(ctx, r.ctx, "CreatePigSickLogTx")
|
||||
return tx.WithContext(repoCtx).Create(log).Error
|
||||
}
|
||||
|
||||
// GetLastLogByBatchTx 在事务中获取指定批次和猪栏的最新一条 PigSickLog 记录
|
||||
func (r *gormPigSickLogRepository) GetLastLogByBatchTx(tx *gorm.DB, batchID uint) (*models.PigSickLog, error) {
|
||||
func (r *gormPigSickLogRepository) GetLastLogByBatchTx(ctx context.Context, tx *gorm.DB, batchID uint) (*models.PigSickLog, error) {
|
||||
repoCtx := logs.AddFuncName(ctx, r.ctx, "GetLastLogByBatchTx")
|
||||
var lastLog models.PigSickLog
|
||||
err := tx.
|
||||
err := tx.WithContext(repoCtx).
|
||||
Where("pig_batch_id = ?", batchID).
|
||||
Order("happened_at DESC"). // 按时间降序排列
|
||||
First(&lastLog).Error // 获取第一条记录 (即最新一条)
|
||||
@@ -69,7 +76,8 @@ func (r *gormPigSickLogRepository) GetLastLogByBatchTx(tx *gorm.DB, batchID uint
|
||||
}
|
||||
|
||||
// ListPigSickLogs 实现了分页和过滤查询病猪日志的功能
|
||||
func (r *gormPigSickLogRepository) ListPigSickLogs(opts PigSickLogListOptions, page, pageSize int) ([]models.PigSickLog, int64, error) {
|
||||
func (r *gormPigSickLogRepository) ListPigSickLogs(ctx context.Context, opts PigSickLogListOptions, page, pageSize int) ([]models.PigSickLog, int64, error) {
|
||||
repoCtx := logs.AddFuncName(ctx, r.ctx, "ListPigSickLogs")
|
||||
if page <= 0 || pageSize <= 0 {
|
||||
return nil, 0, ErrInvalidPagination
|
||||
}
|
||||
@@ -77,7 +85,7 @@ func (r *gormPigSickLogRepository) ListPigSickLogs(opts PigSickLogListOptions, p
|
||||
var results []models.PigSickLog
|
||||
var total int64
|
||||
|
||||
query := r.db.Model(&models.PigSickLog{})
|
||||
query := r.db.WithContext(repoCtx).Model(&models.PigSickLog{})
|
||||
|
||||
if opts.PigBatchID != nil {
|
||||
query = query.Where("pig_batch_id = ?", *opts.PigBatchID)
|
||||
|
||||
Reference in New Issue
Block a user