pig/pig-farm-controller
1
0
Fork 0
Code Issues 11 Pull Requests Actions Packages Projects Releases Wiki Activity

调整仓库方法归属

Browse Source
This commit is contained in:
huang
2025-10-05 17:42:27 +08:00
parent 01327eb8d2
commit b3933b6d63
6 changed files with 158 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
internal/app/service/pig_farm_service.go
View File

@@ -31,17 +31,19 @@ type PigFarmService interface {
}
type pigFarmService struct {
logger *logs.Logger
repo repository.PigFarmRepository
uow repository.UnitOfWork // 工作单元，用于事务管理
logger *logs.Logger
farmRepository repository.PigFarmRepository
penRepository repository.PigPenRepository
uow repository.UnitOfWork // 工作单元，用于事务管理
}
// NewPigFarmService 创建一个新的 PigFarmService 实例
func NewPigFarmService(repo repository.PigFarmRepository, uow repository.UnitOfWork, logger *logs.Logger) PigFarmService {
func NewPigFarmService(farmRepository repository.PigFarmRepository, penRepository repository.PigPenRepository, uow repository.UnitOfWork, logger *logs.Logger) PigFarmService {
return &pigFarmService{
logger: logger,
repo: repo,
uow: uow,
logger: logger,
farmRepository: farmRepository,
penRepository: penRepository,
uow: uow,
}
}
@@ -52,16 +54,16 @@ func (s *pigFarmService) CreatePigHouse(name, description string) (*models.PigHo
Name: name,
Description: description,
}
err := s.repo.CreatePigHouse(house)
err := s.farmRepository.CreatePigHouse(house)
return house, err
}
func (s *pigFarmService) GetPigHouseByID(id uint) (*models.PigHouse, error) {
return s.repo.GetPigHouseByID(id)
return s.farmRepository.GetPigHouseByID(id)
}
func (s *pigFarmService) ListPigHouses() ([]models.PigHouse, error) {
return s.repo.ListPigHouses()
return s.farmRepository.ListPigHouses()
}
func (s *pigFarmService) UpdatePigHouse(id uint, name, description string) (*models.PigHouse, error) {
@@ -70,7 +72,7 @@ func (s *pigFarmService) UpdatePigHouse(id uint, name, description string) (*mod
Name: name,
Description: description,
}
rowsAffected, err := s.repo.UpdatePigHouse(house)
rowsAffected, err := s.farmRepository.UpdatePigHouse(house)
if err != nil {
return nil, err
}
@@ -78,12 +80,12 @@ func (s *pigFarmService) UpdatePigHouse(id uint, name, description string) (*mod
return nil, ErrHouseNotFound
}
// 返回更新后的完整信息
return s.repo.GetPigHouseByID(id)
return s.farmRepository.GetPigHouseByID(id)
}
func (s *pigFarmService) DeletePigHouse(id uint) error {
// 业务逻辑：检查猪舍是否包含猪栏
penCount, err := s.repo.CountPensInHouse(id)
penCount, err := s.farmRepository.CountPensInHouse(id)
if err != nil {
return err
}
@@ -92,7 +94,7 @@ func (s *pigFarmService) DeletePigHouse(id uint) error {
}
// 调用仓库层进行删除
rowsAffected, err := s.repo.DeletePigHouse(id)
rowsAffected, err := s.farmRepository.DeletePigHouse(id)
if err != nil {
return err
}
@@ -106,7 +108,7 @@ func (s *pigFarmService) DeletePigHouse(id uint) error {
func (s *pigFarmService) CreatePen(penNumber string, houseID uint, capacity int) (*models.Pen, error) {
// 业务逻辑：验证所属猪舍是否存在
_, err := s.repo.GetPigHouseByID(houseID)
_, err := s.farmRepository.GetPigHouseByID(houseID)
if err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
return nil, ErrHouseNotFound
@@ -120,21 +122,21 @@ func (s *pigFarmService) CreatePen(penNumber string, houseID uint, capacity int)
Capacity: capacity,
Status: models.PenStatusEmpty,
}
err = s.repo.CreatePen(pen)
err = s.penRepository.CreatePen(pen)
return pen, err
}
func (s *pigFarmService) GetPenByID(id uint) (*models.Pen, error) {
return s.repo.GetPenByID(id)
return s.penRepository.GetPenByID(id)
}
func (s *pigFarmService) ListPens() ([]models.Pen, error) {
return s.repo.ListPens()
return s.penRepository.ListPens()
}
func (s *pigFarmService) UpdatePen(id uint, penNumber string, houseID uint, capacity int, status models.PenStatus) (*models.Pen, error) {
// 业务逻辑：验证所属猪舍是否存在
_, err := s.repo.GetPigHouseByID(houseID)
_, err := s.farmRepository.GetPigHouseByID(houseID)
if err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
return nil, ErrHouseNotFound
@@ -149,7 +151,7 @@ func (s *pigFarmService) UpdatePen(id uint, penNumber string, houseID uint, capa
Capacity: capacity,
Status: status,
}
rowsAffected, err := s.repo.UpdatePen(pen)
rowsAffected, err := s.penRepository.UpdatePen(pen)
if err != nil {
return nil, err
}
@@ -157,12 +159,12 @@ func (s *pigFarmService) UpdatePen(id uint, penNumber string, houseID uint, capa
return nil, ErrPenNotFound
}
// 返回更新后的完整信息
return s.repo.GetPenByID(id)
return s.penRepository.GetPenByID(id)
}
func (s *pigFarmService) DeletePen(id uint) error {
// 业务逻辑：检查猪栏是否被活跃批次使用
pen, err := s.repo.GetPenByID(id)
pen, err := s.penRepository.GetPenByID(id)
if err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
return ErrPenNotFound // 猪栏不存在
@@ -173,7 +175,7 @@ func (s *pigFarmService) DeletePen(id uint) error {
// 检查猪栏是否关联了活跃批次
// 注意：pen.PigBatchID 是指针类型，需要检查是否为 nil
if pen.PigBatchID != nil && *pen.PigBatchID != 0 {
pigBatch, err := s.repo.GetPigBatchByID(*pen.PigBatchID)
pigBatch, err := s.farmRepository.GetPigBatchByID(*pen.PigBatchID)
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
return err
}
@@ -184,7 +186,7 @@ func (s *pigFarmService) DeletePen(id uint) error {
}
// 调用仓库层进行删除
rowsAffected, err := s.repo.DeletePen(id)
rowsAffected, err := s.penRepository.DeletePen(id)
if err != nil {
return err
}
@@ -198,7 +200,7 @@ func (s *pigFarmService) DeletePen(id uint) error {
func (s *pigFarmService) UpdatePenStatus(id uint, newStatus models.PenStatus) (*models.Pen, error) {
var updatedPen *models.Pen
err := s.uow.ExecuteInTransaction(func(tx *gorm.DB) error {
pen, err := s.repo.GetPenByIDTx(tx, id)
pen, err := s.penRepository.GetPenByIDTx(tx, id)
if err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
return ErrPenNotFound
@@ -228,13 +230,13 @@ func (s *pigFarmService) UpdatePenStatus(id uint, newStatus models.PenStatus) (*
"status": newStatus,
}
if err := s.repo.UpdatePenFields(tx, id, updates); err != nil {
if err := s.penRepository.UpdatePenFields(tx, id, updates); err != nil {
s.logger.Errorf("更新猪栏 %d 状态失败: %v", id, err)
return fmt.Errorf("更新猪栏 %d 状态失败: %w", id, err)
}
// 获取更新后的猪栏信息
updatedPen, err = s.repo.GetPenByIDTx(tx, id)
updatedPen, err = s.penRepository.GetPenByIDTx(tx, id)
if err != nil {
s.logger.Errorf("更新猪栏状态后获取猪栏 %d 信息失败: %v", id, err)
return fmt.Errorf("更新猪栏状态后获取猪栏 %d 信息失败: %w", id, err)