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

issue_39 #40

Merged
huang merged 5 commits from issue_39 into main 2025-10-23 16:07:21 +08:00
Conversation 0 Commits 5 Files Changed 16 +6 -6
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 21607559c4 - Show all commits

12
internal/app/service/pig_batch_service.go
View File

@@ -106,12 +106,12 @@ func (s *pigBatchService) GetPigBatch(id uint) (*dto.PigBatchResponseDTO, error)
s.logger.Warnf("应用层: 获取猪批次失败, ID: %d, 错误: %v", id, err) s.logger.Warnf("应用层: 获取猪批次失败, ID: %d, 错误: %v", id, err)
return nil, MapDomainError(err) return nil, MapDomainError(err)
} }
currentTotalQuantity, err := s.domainService.GetCurrentPigsInPen(id) currentTotalQuantity, err := s.domainService.GetCurrentPigQuantity(id)
if err != nil { if err != nil {
s.logger.Warnf("应用层: 获取猪批次总数失败, ID: %d, 错误: %v", id, err) s.logger.Warnf("应用层: 获取猪批次总数失败, ID: %d, 错误: %v", id, err)
return nil, MapDomainError(err) return nil, MapDomainError(err)
} }
currentTotalPigsInPens, err := s.domainService.GetCurrentPigsInPen(id) currentTotalPigsInPens, err := s.domainService.GetTotalPigsInPensForBatch(id)
if err != nil { if err != nil {
s.logger.Warnf("应用层: 获取猪批次存栏总数失败, ID: %d, 错误: %v", id, err) s.logger.Warnf("应用层: 获取猪批次存栏总数失败, ID: %d, 错误: %v", id, err)
return nil, MapDomainError(err) return nil, MapDomainError(err)
@@ -156,12 +156,12 @@ func (s *pigBatchService) UpdatePigBatch(id uint, dto *dto.PigBatchUpdateDTO) (*
} }
// 4. 填充猪群信息 // 4. 填充猪群信息
currentTotalQuantity, err := s.domainService.GetCurrentPigsInPen(id) currentTotalQuantity, err := s.domainService.GetCurrentPigQuantity(id)
if err != nil { if err != nil {
s.logger.Warnf("应用层: 获取猪批次总数失败, ID: %d, 错误: %v", id, err) s.logger.Warnf("应用层: 获取猪批次总数失败, ID: %d, 错误: %v", id, err)
return nil, MapDomainError(err) return nil, MapDomainError(err)
} }
currentTotalPigsInPens, err := s.domainService.GetCurrentPigsInPen(id) currentTotalPigsInPens, err := s.domainService.GetTotalPigsInPensForBatch(id)
if err != nil { if err != nil {
s.logger.Warnf("应用层: 获取猪批次存栏总数失败, ID: %d, 错误: %v", id, err) s.logger.Warnf("应用层: 获取猪批次存栏总数失败, ID: %d, 错误: %v", id, err)
return nil, MapDomainError(err) return nil, MapDomainError(err)
@@ -191,12 +191,12 @@ func (s *pigBatchService) ListPigBatches(isActive *bool) ([]*dto.PigBatchRespons
var responseDTOs []*dto.PigBatchResponseDTO var responseDTOs []*dto.PigBatchResponseDTO
for _, batch := range batches { for _, batch := range batches {
currentTotalQuantity, err := s.domainService.GetCurrentPigsInPen(batch.ID) currentTotalQuantity, err := s.domainService.GetCurrentPigQuantity(batch.ID)
if err != nil { if err != nil {
s.logger.Warnf("应用层: 获取猪批次总数失败, ID: %d, 错误: %v", batch.ID, err) s.logger.Warnf("应用层: 获取猪批次总数失败, ID: %d, 错误: %v", batch.ID, err)
return nil, MapDomainError(err) return nil, MapDomainError(err)
} }
currentTotalPigsInPens, err := s.domainService.GetCurrentPigsInPen(batch.ID) currentTotalPigsInPens, err := s.domainService.GetTotalPigsInPensForBatch(batch.ID)
if err != nil { if err != nil {
s.logger.Warnf("应用层: 获取猪批次存栏总数失败, ID: %d, 错误: %v", batch.ID, err) s.logger.Warnf("应用层: 获取猪批次存栏总数失败, ID: %d, 错误: %v", batch.ID, err)
return nil, MapDomainError(err) return nil, MapDomainError(err)