猪群相关接口增加当前总量和当前总存栏量

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