From c1f71050e9d38fa914e5e0a11f593fc56c8f40ec Mon Sep 17 00:00:00 2001 From: huang <1724659546@qq.com> Date: Thu, 23 Oct 2025 10:52:40 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=8C=AA=E6=A0=8F=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E7=8C=AA=E6=A0=8F=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E5=AD=98=E6=A0=8F=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/docs.go | 3 + docs/swagger.json | 3 + docs/swagger.yaml | 2 + .../controller/management/feed_controller.go | 1 - .../management/medication_controller.go | 1 - .../controller/management/pig_controller.go | 1 - .../management/pig_farm_controller.go | 45 +++--------- internal/app/dto/pig_farm_dto.go | 13 ++-- internal/app/service/pig_farm_service.go | 71 +++++++++++++++++-- internal/core/application.go | 2 +- internal/domain/pig/pig_batch_service.go | 15 ++++ 11 files changed, 104 insertions(+), 53 deletions(-) delete mode 100644 internal/app/controller/management/feed_controller.go delete mode 100644 internal/app/controller/management/medication_controller.go delete mode 100644 internal/app/controller/management/pig_controller.go diff --git a/docs/docs.go b/docs/docs.go index 0ad65c6..7fc54ea 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -4770,6 +4770,9 @@ const docTemplate = `{ "capacity": { "type": "integer" }, + "current_pig_count": { + "type": "integer" + }, "house_id": { "type": "integer" }, diff --git a/docs/swagger.json b/docs/swagger.json index 039d386..77b9d90 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -4762,6 +4762,9 @@ "capacity": { "type": "integer" }, + "current_pig_count": { + "type": "integer" + }, "house_id": { "type": "integer" }, diff --git a/docs/swagger.yaml b/docs/swagger.yaml index ad1bfce..ca941fa 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -572,6 +572,8 @@ definitions: properties: capacity: type: integer + current_pig_count: + type: integer house_id: type: integer id: diff --git a/internal/app/controller/management/feed_controller.go b/internal/app/controller/management/feed_controller.go deleted file mode 100644 index bd32643..0000000 --- a/internal/app/controller/management/feed_controller.go +++ /dev/null @@ -1 +0,0 @@ -package management diff --git a/internal/app/controller/management/medication_controller.go b/internal/app/controller/management/medication_controller.go deleted file mode 100644 index bd32643..0000000 --- a/internal/app/controller/management/medication_controller.go +++ /dev/null @@ -1 +0,0 @@ -package management diff --git a/internal/app/controller/management/pig_controller.go b/internal/app/controller/management/pig_controller.go deleted file mode 100644 index bd32643..0000000 --- a/internal/app/controller/management/pig_controller.go +++ /dev/null @@ -1 +0,0 @@ -package management diff --git a/internal/app/controller/management/pig_farm_controller.go b/internal/app/controller/management/pig_farm_controller.go index e787254..f0a005e 100644 --- a/internal/app/controller/management/pig_farm_controller.go +++ b/internal/app/controller/management/pig_farm_controller.go @@ -276,17 +276,7 @@ func (c *PigFarmController) GetPen(ctx *gin.Context) { return } - resp := dto.PenResponse{ - ID: pen.ID, - PenNumber: pen.PenNumber, - HouseID: pen.HouseID, - Capacity: pen.Capacity, - Status: pen.Status, - } - if pen.PigBatchID != nil { - resp.PigBatchID = *pen.PigBatchID - } - controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "获取成功", resp, action, "获取成功", resp) + controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "获取成功", pen, action, "获取成功", pen) } // ListPens godoc @@ -306,22 +296,7 @@ func (c *PigFarmController) ListPens(ctx *gin.Context) { return } - var resp []dto.PenResponse - for _, pen := range pens { - res := dto.PenResponse{ - ID: pen.ID, - PenNumber: pen.PenNumber, - HouseID: pen.HouseID, - Capacity: pen.Capacity, - Status: pen.Status, - } - if pen.PigBatchID != nil { - res.PigBatchID = *pen.PigBatchID - } - resp = append(resp, res) - } - - controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "获取成功", resp, action, "获取成功", resp) + controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "获取成功", pens, action, "获取成功", pens) } // UpdatePen godoc @@ -362,14 +337,12 @@ func (c *PigFarmController) UpdatePen(ctx *gin.Context) { } resp := dto.PenResponse{ - ID: pen.ID, - PenNumber: pen.PenNumber, - HouseID: pen.HouseID, - Capacity: pen.Capacity, - Status: pen.Status, - } - if pen.PigBatchID != nil { - resp.PigBatchID = *pen.PigBatchID + ID: pen.ID, + PenNumber: pen.PenNumber, + HouseID: pen.HouseID, + Capacity: pen.Capacity, + Status: pen.Status, + PigBatchID: pen.PigBatchID, } controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "更新成功", resp, action, "更新成功", resp) } @@ -454,7 +427,7 @@ func (c *PigFarmController) UpdatePenStatus(ctx *gin.Context) { HouseID: pen.HouseID, Capacity: pen.Capacity, Status: pen.Status, - PigBatchID: *pen.PigBatchID, + PigBatchID: pen.PigBatchID, } controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "更新成功", resp, action, "更新成功", resp) } diff --git a/internal/app/dto/pig_farm_dto.go b/internal/app/dto/pig_farm_dto.go index 09f450a..84e36ed 100644 --- a/internal/app/dto/pig_farm_dto.go +++ b/internal/app/dto/pig_farm_dto.go @@ -11,12 +11,13 @@ type PigHouseResponse struct { // PenResponse 定义了猪栏信息的响应结构 type PenResponse struct { - ID uint `json:"id"` - PenNumber string `json:"pen_number"` - HouseID uint `json:"house_id"` - Capacity int `json:"capacity"` - Status models.PenStatus `json:"status"` - PigBatchID uint `json:"pig_batch_id"` + ID uint `json:"id"` + PenNumber string `json:"pen_number"` + HouseID uint `json:"house_id"` + Capacity int `json:"capacity"` + Status models.PenStatus `json:"status"` + PigBatchID *uint `json:"pig_batch_id,omitempty"` + CurrentPigCount int `json:"current_pig_count"` } // CreatePigHouseRequest 定义了创建猪舍的请求结构 diff --git a/internal/app/service/pig_farm_service.go b/internal/app/service/pig_farm_service.go index 5f4b0c5..65bbb97 100644 --- a/internal/app/service/pig_farm_service.go +++ b/internal/app/service/pig_farm_service.go @@ -4,6 +4,8 @@ import ( "errors" "fmt" + "git.huangwc.com/pig/pig-farm-controller/internal/app/dto" + domain_pig "git.huangwc.com/pig/pig-farm-controller/internal/domain/pig" "git.huangwc.com/pig/pig-farm-controller/internal/infra/logs" "git.huangwc.com/pig/pig-farm-controller/internal/infra/models" "git.huangwc.com/pig/pig-farm-controller/internal/infra/repository" @@ -22,8 +24,8 @@ type PigFarmService interface { // Pen methods CreatePen(penNumber string, houseID uint, capacity int) (*models.Pen, error) - GetPenByID(id uint) (*models.Pen, error) - ListPens() ([]models.Pen, error) + GetPenByID(id uint) (*dto.PenResponse, error) + ListPens() ([]*dto.PenResponse, error) UpdatePen(id uint, penNumber string, houseID uint, capacity int, status models.PenStatus) (*models.Pen, error) DeletePen(id uint) error // UpdatePenStatus 更新猪栏状态 @@ -35,13 +37,15 @@ type pigFarmService struct { farmRepository repository.PigFarmRepository penRepository repository.PigPenRepository batchRepository repository.PigBatchRepository - uow repository.UnitOfWork // 工作单元，用于事务管理 + pigBatchService domain_pig.PigBatchService // Add domain PigBatchService dependency + uow repository.UnitOfWork // 工作单元，用于事务管理 } // NewPigFarmService 创建一个新的 PigFarmService 实例 func NewPigFarmService(farmRepository repository.PigFarmRepository, penRepository repository.PigPenRepository, batchRepository repository.PigBatchRepository, + pigBatchService domain_pig.PigBatchService, uow repository.UnitOfWork, logger *logs.Logger) PigFarmService { return &pigFarmService{ @@ -49,6 +53,7 @@ func NewPigFarmService(farmRepository repository.PigFarmRepository, farmRepository: farmRepository, penRepository: penRepository, batchRepository: batchRepository, + pigBatchService: pigBatchService, uow: uow, } } @@ -132,12 +137,64 @@ func (s *pigFarmService) CreatePen(penNumber string, houseID uint, capacity int) return pen, err } -func (s *pigFarmService) GetPenByID(id uint) (*models.Pen, error) { - return s.penRepository.GetPenByID(id) +func (s *pigFarmService) GetPenByID(id uint) (*dto.PenResponse, error) { + pen, err := s.penRepository.GetPenByID(id) + if err != nil { + return nil, err + } + + currentPigCount, err := s.pigBatchService.GetCurrentPigsInPen(id) + if err != nil { + s.logger.Errorf("获取猪栏 %d 存栏量失败: %v", id, err) + currentPigCount = 0 // 如果获取计数时出错，则默认为0 + } + + response := &dto.PenResponse{ + ID: pen.ID, + PenNumber: pen.PenNumber, + HouseID: pen.HouseID, + Capacity: pen.Capacity, + Status: pen.Status, + CurrentPigCount: currentPigCount, + } + + if pen.PigBatchID != nil { + response.PigBatchID = pen.PigBatchID + } + + return response, nil } -func (s *pigFarmService) ListPens() ([]models.Pen, error) { - return s.penRepository.ListPens() +func (s *pigFarmService) ListPens() ([]*dto.PenResponse, error) { + pens, err := s.penRepository.ListPens() + if err != nil { + return nil, err + } + + var response []*dto.PenResponse + for _, pen := range pens { + currentPigCount, err := s.pigBatchService.GetCurrentPigsInPen(pen.ID) + if err != nil { + s.logger.Errorf("获取猪栏 %d 存栏量失败: %v", pen.ID, err) + currentPigCount = 0 // 如果获取计数时出错，则默认为0 + } + + penResponse := &dto.PenResponse{ + ID: pen.ID, + PenNumber: pen.PenNumber, + HouseID: pen.HouseID, + Capacity: pen.Capacity, + Status: pen.Status, + CurrentPigCount: currentPigCount, + } + + if pen.PigBatchID != nil { + penResponse.PigBatchID = pen.PigBatchID + } + response = append(response, penResponse) + } + + return response, nil } func (s *pigFarmService) UpdatePen(id uint, penNumber string, houseID uint, capacity int, status models.PenStatus) (*models.Pen, error) { diff --git a/internal/core/application.go b/internal/core/application.go index df0e6c7..573cad6 100644 --- a/internal/core/application.go +++ b/internal/core/application.go @@ -97,7 +97,7 @@ func NewApplication(configPath string) (*Application, error) { pigPenTransferManager, pigTradeManager, pigSickManager) // --- 业务逻辑处理器初始化 --- - pigFarmService := service.NewPigFarmService(pigFarmRepo, pigPenRepo, pigBatchRepo, unitOfWork, logger) + pigFarmService := service.NewPigFarmService(pigFarmRepo, pigPenRepo, pigBatchRepo, pigBatchDomain, unitOfWork, logger) pigBatchService := service.NewPigBatchService(pigBatchDomain, logger) monitorService := service.NewMonitorService( sensorDataRepo, diff --git a/internal/domain/pig/pig_batch_service.go b/internal/domain/pig/pig_batch_service.go index d0911d1..004c9a3 100644 --- a/internal/domain/pig/pig_batch_service.go +++ b/internal/domain/pig/pig_batch_service.go @@ -58,6 +58,8 @@ type PigBatchService interface { // GetCurrentPigQuantity 获取指定猪批次的当前猪只数量。 GetCurrentPigQuantity(batchID uint) (int, error) + // GetCurrentPigsInPen 获取指定猪栏的当前存栏量。 + GetCurrentPigsInPen(penID uint) (int, error) UpdatePigBatchQuantity(operatorID uint, batchID uint, changeType models.LogChangeType, changeAmount int, changeReason string, happenedAt time.Time) error @@ -163,3 +165,16 @@ func (s *pigBatchService) RemoveEmptyPenFromBatch(batchID uint, penID uint) erro return nil }) } + +func (s *pigBatchService) GetCurrentPigsInPen(penID uint) (int, error) { + var currentPigs int + err := s.uow.ExecuteInTransaction(func(tx *gorm.DB) error { + pigs, err := s.transferSvc.GetCurrentPigsInPen(tx, penID) + if err != nil { + return err + } + currentPigs = pigs + return nil + }) + return currentPigs, err +} -- 2.49.1 From 324a533c94e1dbe22526ac7fab5348e0c2ea11c6 Mon Sep 17 00:00:00 2001 From: huang <1724659546@qq.com> Date: Thu, 23 Oct 2025 11:29:48 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=8C=AA=E7=BE=A4=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E5=BD=93=E5=89=8D=E6=80=BB?= =?UTF-8?q?=E9=87=8F=E5=92=8C=E5=BD=93=E5=89=8D=E6=80=BB=E5=AD=98=E6=A0=8F?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/docs.go | 8 +++ docs/swagger.json | 8 +++ docs/swagger.yaml | 6 ++ internal/app/dto/pig_batch_dto.go | 22 +++--- internal/app/service/pig_batch_service.go | 67 ++++++++++++----- internal/domain/pig/pig_batch_service.go | 61 +--------------- .../pig/pig_batch_service_pen_transfer.go | 72 +++++++++++++++++++ 7 files changed, 158 insertions(+), 86 deletions(-) diff --git a/docs/docs.go b/docs/docs.go index 7fc54ea..460adbc 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -4906,6 +4906,14 @@ const docTemplate = `{ "description": "创建时间", "type": "string" }, + "currentTotalPigsInPens": { + "description": "当前存栏总数", + "type": "integer" + }, + "currentTotalQuantity": { + "description": "当前总数", + "type": "integer" + }, "end_date": { "description": "批次结束日期", "type": "string" diff --git a/docs/swagger.json b/docs/swagger.json index 77b9d90..067a487 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -4898,6 +4898,14 @@ "description": "创建时间", "type": "string" }, + "currentTotalPigsInPens": { + "description": "当前存栏总数", + "type": "integer" + }, + "currentTotalQuantity": { + "description": "当前总数", + "type": "integer" + }, "end_date": { "description": "批次结束日期", "type": "string" diff --git a/docs/swagger.yaml b/docs/swagger.yaml index ca941fa..0953c91 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -662,6 +662,12 @@ definitions: create_time: description: 创建时间 type: string + currentTotalPigsInPens: + description: 当前存栏总数 + type: integer + currentTotalQuantity: + description: 当前总数 + type: integer end_date: description: 批次结束日期 type: string diff --git a/internal/app/dto/pig_batch_dto.go b/internal/app/dto/pig_batch_dto.go index 8485d87..64f2c25 100644 --- a/internal/app/dto/pig_batch_dto.go +++ b/internal/app/dto/pig_batch_dto.go @@ -32,16 +32,18 @@ type PigBatchQueryDTO struct { // PigBatchResponseDTO 定义了猪批次信息的响应结构 type PigBatchResponseDTO struct { - ID uint `json:"id"` // 批次ID - BatchNumber string `json:"batch_number"` // 批次编号 - OriginType models.PigBatchOriginType `json:"origin_type"` // 批次来源 - StartDate time.Time `json:"start_date"` // 批次开始日期 - EndDate time.Time `json:"end_date"` // 批次结束日期 - InitialCount int `json:"initial_count"` // 初始数量 - Status models.PigBatchStatus `json:"status"` // 批次状态 - IsActive bool `json:"is_active"` // 是否活跃 - CreateTime time.Time `json:"create_time"` // 创建时间 - UpdateTime time.Time `json:"update_time"` // 更新时间 + ID uint `json:"id"` // 批次ID + BatchNumber string `json:"batch_number"` // 批次编号 + OriginType models.PigBatchOriginType `json:"origin_type"` // 批次来源 + StartDate time.Time `json:"start_date"` // 批次开始日期 + EndDate time.Time `json:"end_date"` // 批次结束日期 + InitialCount int `json:"initial_count"` // 初始数量 + Status models.PigBatchStatus `json:"status"` // 批次状态 + IsActive bool `json:"is_active"` // 是否活跃 + CurrentTotalQuantity int `json:"currentTotalQuantity"` // 当前总数 + CurrentTotalPigsInPens int `json:"currentTotalPigsInPens"` // 当前存栏总数 + CreateTime time.Time `json:"create_time"` // 创建时间 + UpdateTime time.Time `json:"update_time"` // 更新时间 } // AssignEmptyPensToBatchRequest 用于为猪批次分配空栏的请求体 diff --git a/internal/app/service/pig_batch_service.go b/internal/app/service/pig_batch_service.go index 4f362c5..9ba4d3c 100644 --- a/internal/app/service/pig_batch_service.go +++ b/internal/app/service/pig_batch_service.go @@ -57,21 +57,23 @@ func NewPigBatchService(domainService domain_pig.PigBatchService, logger *logs.L } // toPigBatchResponseDTO 负责将领域模型转换为应用层DTO，这个职责保留在应用层。 -func (s *pigBatchService) toPigBatchResponseDTO(batch *models.PigBatch) *dto.PigBatchResponseDTO { +func (s *pigBatchService) toPigBatchResponseDTO(batch *models.PigBatch, currentTotalQuantity, currentTotalPigsInPens int) *dto.PigBatchResponseDTO { if batch == nil { return nil } return &dto.PigBatchResponseDTO{ - ID: batch.ID, - BatchNumber: batch.BatchNumber, - OriginType: batch.OriginType, - StartDate: batch.StartDate, - EndDate: batch.EndDate, - InitialCount: batch.InitialCount, - Status: batch.Status, - IsActive: batch.IsActive(), - CreateTime: batch.CreatedAt, - UpdateTime: batch.UpdatedAt, + ID: batch.ID, + BatchNumber: batch.BatchNumber, + OriginType: batch.OriginType, + StartDate: batch.StartDate, + EndDate: batch.EndDate, + InitialCount: batch.InitialCount, + Status: batch.Status, + IsActive: batch.IsActive(), + CurrentTotalQuantity: currentTotalQuantity, + CurrentTotalPigsInPens: currentTotalPigsInPens, + CreateTime: batch.CreatedAt, + UpdateTime: batch.UpdatedAt, } } @@ -94,7 +96,7 @@ func (s *pigBatchService) CreatePigBatch(operatorID uint, dto *dto.PigBatchCreat } // 3. 领域模型 -> DTO - return s.toPigBatchResponseDTO(createdBatch), nil + return s.toPigBatchResponseDTO(createdBatch, dto.InitialCount, 0), nil } // GetPigBatch 从领域服务获取数据并转换为DTO，同时处理错误转换。 @@ -104,8 +106,17 @@ func (s *pigBatchService) GetPigBatch(id uint) (*dto.PigBatchResponseDTO, error) s.logger.Warnf("应用层: 获取猪批次失败, ID: %d, 错误: %v", id, err) return nil, MapDomainError(err) } - - return s.toPigBatchResponseDTO(batch), nil + currentTotalQuantity, err := s.domainService.GetCurrentPigsInPen(id) + if err != nil { + s.logger.Warnf("应用层: 获取猪批次总数失败, ID: %d, 错误: %v", id, err) + return nil, MapDomainError(err) + } + currentTotalPigsInPens, err := s.domainService.GetCurrentPigsInPen(id) + if err != nil { + s.logger.Warnf("应用层: 获取猪批次存栏总数失败, ID: %d, 错误: %v", id, err) + return nil, MapDomainError(err) + } + return s.toPigBatchResponseDTO(batch, currentTotalQuantity, currentTotalPigsInPens), nil } // UpdatePigBatch 协调获取、更新和保存的流程，并处理错误转换。 @@ -144,8 +155,20 @@ func (s *pigBatchService) UpdatePigBatch(id uint, dto *dto.PigBatchUpdateDTO) (* return nil, MapDomainError(err) } - // 4. 转换并返回结果 - return s.toPigBatchResponseDTO(updatedBatch), nil + // 4. 填充猪群信息 + currentTotalQuantity, err := s.domainService.GetCurrentPigsInPen(id) + if err != nil { + s.logger.Warnf("应用层: 获取猪批次总数失败, ID: %d, 错误: %v", id, err) + return nil, MapDomainError(err) + } + currentTotalPigsInPens, err := s.domainService.GetCurrentPigsInPen(id) + if err != nil { + s.logger.Warnf("应用层: 获取猪批次存栏总数失败, ID: %d, 错误: %v", id, err) + return nil, MapDomainError(err) + } + + // 5. 转换并返回结果 + return s.toPigBatchResponseDTO(updatedBatch, currentTotalQuantity, currentTotalPigsInPens), nil } // DeletePigBatch 将删除操作委托给领域服务，并转换领域错误为应用层错误。 @@ -168,7 +191,17 @@ func (s *pigBatchService) ListPigBatches(isActive *bool) ([]*dto.PigBatchRespons var responseDTOs []*dto.PigBatchResponseDTO for _, batch := range batches { - responseDTOs = append(responseDTOs, s.toPigBatchResponseDTO(batch)) + currentTotalQuantity, err := s.domainService.GetCurrentPigsInPen(batch.ID) + if err != nil { + s.logger.Warnf("应用层: 获取猪批次总数失败, ID: %d, 错误: %v", batch.ID, err) + return nil, MapDomainError(err) + } + currentTotalPigsInPens, err := s.domainService.GetCurrentPigsInPen(batch.ID) + if err != nil { + s.logger.Warnf("应用层: 获取猪批次存栏总数失败, ID: %d, 错误: %v", batch.ID, err) + return nil, MapDomainError(err) + } + responseDTOs = append(responseDTOs, s.toPigBatchResponseDTO(batch, currentTotalQuantity, currentTotalPigsInPens)) } return responseDTOs, nil diff --git a/internal/domain/pig/pig_batch_service.go b/internal/domain/pig/pig_batch_service.go index 004c9a3..dbe88c1 100644 --- a/internal/domain/pig/pig_batch_service.go +++ b/internal/domain/pig/pig_batch_service.go @@ -6,7 +6,6 @@ import ( "git.huangwc.com/pig/pig-farm-controller/internal/infra/models" "git.huangwc.com/pig/pig-farm-controller/internal/infra/repository" - "gorm.io/gorm" ) // --- 业务错误定义 --- @@ -60,6 +59,8 @@ type PigBatchService interface { GetCurrentPigQuantity(batchID uint) (int, error) // GetCurrentPigsInPen 获取指定猪栏的当前存栏量。 GetCurrentPigsInPen(penID uint) (int, error) + // GetTotalPigsInPensForBatch 获取指定猪群下所有猪栏的当前总存栏数 + GetTotalPigsInPensForBatch(batchID uint) (int, error) UpdatePigBatchQuantity(operatorID uint, batchID uint, changeType models.LogChangeType, changeAmount int, changeReason string, happenedAt time.Time) error @@ -120,61 +121,3 @@ func NewPigBatchService( sickSvc: sickSvc, } } - -func (s *pigBatchService) RemoveEmptyPenFromBatch(batchID uint, penID uint) error { - return s.uow.ExecuteInTransaction(func(tx *gorm.DB) error { - // 1. 检查猪批次是否存在且活跃 - batch, err := s.pigBatchRepo.GetPigBatchByIDTx(tx, batchID) - if err != nil { - if errors.Is(err, gorm.ErrRecordNotFound) { - return ErrPigBatchNotFound - } - return err - } - if !batch.IsActive() { - return ErrPigBatchNotActive - } - - // 2. 检查猪栏是否存在 - pen, err := s.transferSvc.GetPenByID(tx, penID) - if err != nil { - if errors.Is(err, gorm.ErrRecordNotFound) { - return ErrPenNotFound - } - return err - } - - // 3. 检查猪栏是否与当前批次关联 - if pen.PigBatchID == nil || *pen.PigBatchID != batchID { - return ErrPenNotAssociatedWithBatch - } - - // 4. 检查猪栏是否为空 - pigsInPen, err := s.transferSvc.GetCurrentPigsInPen(tx, penID) - if err != nil { - return err - } - if pigsInPen > 0 { - return ErrPenNotEmpty - } - - // 5. 释放猪栏 (将 pig_batch_id 设置为 nil，状态设置为空闲) - if err := s.transferSvc.ReleasePen(tx, penID); err != nil { - return err - } - return nil - }) -} - -func (s *pigBatchService) GetCurrentPigsInPen(penID uint) (int, error) { - var currentPigs int - err := s.uow.ExecuteInTransaction(func(tx *gorm.DB) error { - pigs, err := s.transferSvc.GetCurrentPigsInPen(tx, penID) - if err != nil { - return err - } - currentPigs = pigs - return nil - }) - return currentPigs, err -} diff --git a/internal/domain/pig/pig_batch_service_pen_transfer.go b/internal/domain/pig/pig_batch_service_pen_transfer.go index 0ef76a7..874f761 100644 --- a/internal/domain/pig/pig_batch_service_pen_transfer.go +++ b/internal/domain/pig/pig_batch_service_pen_transfer.go @@ -381,3 +381,75 @@ func (s *pigBatchService) ReclassifyPenToNewBatch(fromBatchID uint, toBatchID ui return nil }) } + +func (s *pigBatchService) RemoveEmptyPenFromBatch(batchID uint, penID uint) error { + return s.uow.ExecuteInTransaction(func(tx *gorm.DB) error { + // 1. 检查猪批次是否存在且活跃 + batch, err := s.pigBatchRepo.GetPigBatchByIDTx(tx, batchID) + if err != nil { + if errors.Is(err, gorm.ErrRecordNotFound) { + return ErrPigBatchNotFound + } + return err + } + if !batch.IsActive() { + return ErrPigBatchNotActive + } + + // 2. 检查猪栏是否存在 + pen, err := s.transferSvc.GetPenByID(tx, penID) + if err != nil { + if errors.Is(err, gorm.ErrRecordNotFound) { + return ErrPenNotFound + } + return err + } + + // 3. 检查猪栏是否与当前批次关联 + if pen.PigBatchID == nil || *pen.PigBatchID != batchID { + return ErrPenNotAssociatedWithBatch + } + + // 4. 检查猪栏是否为空 + pigsInPen, err := s.transferSvc.GetCurrentPigsInPen(tx, penID) + if err != nil { + return err + } + if pigsInPen > 0 { + return ErrPenNotEmpty + } + + // 5. 释放猪栏 (将 pig_batch_id 设置为 nil，状态设置为空闲) + if err := s.transferSvc.ReleasePen(tx, penID); err != nil { + return err + } + return nil + }) +} + +func (s *pigBatchService) GetCurrentPigsInPen(penID uint) (int, error) { + var currentPigs int + err := s.uow.ExecuteInTransaction(func(tx *gorm.DB) error { + pigs, err := s.transferSvc.GetCurrentPigsInPen(tx, penID) + if err != nil { + return err + } + currentPigs = pigs + return nil + }) + return currentPigs, err +} + +// GetTotalPigsInPensForBatch 实现了获取指定猪群下所有猪栏的当前总存栏数的逻辑。 +func (s *pigBatchService) GetTotalPigsInPensForBatch(batchID uint) (int, error) { + var totalPigs int + err := s.uow.ExecuteInTransaction(func(tx *gorm.DB) error { + pigs, err := s.transferSvc.GetTotalPigsInPensForBatchTx(tx, batchID) + if err != nil { + return err + } + totalPigs = pigs + return nil + }) + return totalPigs, err +} -- 2.49.1 From af6a00ee4714dfd4f1bb914c2f34ea5568a729ac Mon Sep 17 00:00:00 2001 From: huang <1724659546@qq.com> Date: Thu, 23 Oct 2025 11:52:08 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/app/controller/management/controller_helpers.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/app/controller/management/controller_helpers.go b/internal/app/controller/management/controller_helpers.go index a37bd27..e4bc122 100644 --- a/internal/app/controller/management/controller_helpers.go +++ b/internal/app/controller/management/controller_helpers.go @@ -2,6 +2,7 @@ package management import ( "errors" + "fmt" "strconv" "git.huangwc.com/pig/pig-farm-controller/internal/app/controller" @@ -25,7 +26,7 @@ func mapAndSendError(c *PigBatchController, ctx *gin.Context, action string, err controller.SendErrorWithAudit(ctx, controller.CodeConflict, err.Error(), action, err.Error(), id) } else { c.logger.Errorf("操作[%s]业务逻辑失败: %v", action, err) - controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "操作失败", action, err.Error(), id) + controller.SendErrorWithAudit(ctx, controller.CodeInternalError, fmt.Sprintf("操作失败: %v", err), action, err.Error(), id) } } @@ -156,7 +157,7 @@ func handleAPIRequestWithResponse[Req any, Resp any]( ) { // 1. 绑定请求体 if err := ctx.ShouldBindJSON(&reqDTO); err != nil { - controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的请求体", action, "请求体绑定失败", reqDTO) + controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, fmt.Sprintf("无效的请求体: %v", err), action, fmt.Sprintf("请求体绑定失败: %v", err), reqDTO) return } -- 2.49.1 From 21607559c4f5f77c362e38093b8f2563082389fd Mon Sep 17 00:00:00 2001 From: huang <1724659546@qq.com> Date: Thu, 23 Oct 2025 12:00:57 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/app/service/pig_batch_service.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/app/service/pig_batch_service.go b/internal/app/service/pig_batch_service.go index 9ba4d3c..e5bc777 100644 --- a/internal/app/service/pig_batch_service.go +++ b/internal/app/service/pig_batch_service.go @@ -106,12 +106,12 @@ func (s *pigBatchService) GetPigBatch(id uint) (*dto.PigBatchResponseDTO, error) s.logger.Warnf("应用层: 获取猪批次失败, ID: %d, 错误: %v", id, err) return nil, MapDomainError(err) } - currentTotalQuantity, err := s.domainService.GetCurrentPigsInPen(id) + currentTotalQuantity, err := s.domainService.GetCurrentPigQuantity(id) if err != nil { s.logger.Warnf("应用层: 获取猪批次总数失败, ID: %d, 错误: %v", id, err) return nil, MapDomainError(err) } - currentTotalPigsInPens, err := s.domainService.GetCurrentPigsInPen(id) + currentTotalPigsInPens, err := s.domainService.GetTotalPigsInPensForBatch(id) if err != nil { s.logger.Warnf("应用层: 获取猪批次存栏总数失败, ID: %d, 错误: %v", id, err) return nil, MapDomainError(err) @@ -156,12 +156,12 @@ func (s *pigBatchService) UpdatePigBatch(id uint, dto *dto.PigBatchUpdateDTO) (* } // 4. 填充猪群信息 - currentTotalQuantity, err := s.domainService.GetCurrentPigsInPen(id) + currentTotalQuantity, err := s.domainService.GetCurrentPigQuantity(id) if err != nil { s.logger.Warnf("应用层: 获取猪批次总数失败, ID: %d, 错误: %v", id, err) return nil, MapDomainError(err) } - currentTotalPigsInPens, err := s.domainService.GetCurrentPigsInPen(id) + currentTotalPigsInPens, err := s.domainService.GetTotalPigsInPensForBatch(id) if err != nil { s.logger.Warnf("应用层: 获取猪批次存栏总数失败, ID: %d, 错误: %v", id, err) return nil, MapDomainError(err) @@ -191,12 +191,12 @@ func (s *pigBatchService) ListPigBatches(isActive *bool) ([]*dto.PigBatchRespons var responseDTOs []*dto.PigBatchResponseDTO for _, batch := range batches { - currentTotalQuantity, err := s.domainService.GetCurrentPigsInPen(batch.ID) + currentTotalQuantity, err := s.domainService.GetCurrentPigQuantity(batch.ID) if err != nil { s.logger.Warnf("应用层: 获取猪批次总数失败, ID: %d, 错误: %v", batch.ID, err) return nil, MapDomainError(err) } - currentTotalPigsInPens, err := s.domainService.GetCurrentPigsInPen(batch.ID) + currentTotalPigsInPens, err := s.domainService.GetTotalPigsInPensForBatch(batch.ID) if err != nil { s.logger.Warnf("应用层: 获取猪批次存栏总数失败, ID: %d, 错误: %v", batch.ID, err) return nil, MapDomainError(err) -- 2.49.1 From b1dce77e51698c6b69e803d38e5795f97153505f Mon Sep 17 00:00:00 2001 From: huang <1724659546@qq.com> Date: Thu, 23 Oct 2025 16:06:15 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/app/api/router.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/app/api/router.go b/internal/app/api/router.go index 99fdbf6..e5ac36e 100644 --- a/internal/app/api/router.go +++ b/internal/app/api/router.go @@ -140,7 +140,7 @@ func (a *API) setupRoutes() { pigBatchGroup.DELETE("/:id", a.pigBatchController.DeletePigBatch) // 删除猪群 pigBatchGroup.POST("/assign-pens/:id", a.pigBatchController.AssignEmptyPensToBatch) // 为猪群分配空栏 pigBatchGroup.POST("/reclassify-pen/:fromBatchID", a.pigBatchController.ReclassifyPenToNewBatch) // 将猪栏划拨到新群 - penGroup.DELETE("/remove-pen/:penID/:batchID", a.pigBatchController.RemoveEmptyPenFromBatch) // 从猪群移除空栏 + pigBatchGroup.DELETE("/remove-pen/:penID/:batchID", a.pigBatchController.RemoveEmptyPenFromBatch) // 从猪群移除空栏 pigBatchGroup.POST("/move-pigs-into-pen/:id", a.pigBatchController.MovePigsIntoPen) // 将猪只从“虚拟库存”移入指定猪栏 pigBatchGroup.POST("/sell-pigs/:id", a.pigBatchController.SellPigs) // 处理卖猪业务 pigBatchGroup.POST("/buy-pigs/:id", a.pigBatchController.BuyPigs) // 处理买猪业务 -- 2.49.1