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

原料增加最大添加量限制

Browse Source
This commit is contained in:
huang
2025-11-27 00:39:01 +08:00
parent 5c99ff7475
commit dca6cc5dd4
3 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
internal/app/dto/feed_dto.go
View File

@@ -52,16 +52,18 @@ type ListNutrientResponse struct {
// CreateRawMaterialRequest 创建原料的请求体 // CreateRawMaterialRequest 创建原料的请求体
type CreateRawMaterialRequest struct { type CreateRawMaterialRequest struct {
Name string `json:"name" validate:"required,max=100"` // 原料名称 Name string `json:"name" validate:"required,max=100"` // 原料名称
Description string `json:"description" validate:"max=255"` // 描述 Description string `json:"description" validate:"max=255"` // 描述
ReferencePrice float32 `json:"reference_price"` // 参考价格(kg/元) ReferencePrice float32 `json:"reference_price"` // 参考价格(kg/元)
MaxAdditionRatio float32 `json:"max_addition_ratio"` // 最大添加比例
} }
// UpdateRawMaterialRequest 更新原料的请求体 // UpdateRawMaterialRequest 更新原料的请求体
type UpdateRawMaterialRequest struct { type UpdateRawMaterialRequest struct {
Name string `json:"name" validate:"required,max=100"` // 原料名称 Name string `json:"name" validate:"required,max=100"` // 原料名称
Description string `json:"description" validate:"max=255"` // 描述 Description string `json:"description" validate:"max=255"` // 描述
ReferencePrice float32 `json:"reference_price"` // 参考价格(kg/元) ReferencePrice float32 `json:"reference_price"` // 参考价格(kg/元)
MaxAdditionRatio *float32 `json:"max_addition_ratio"` // 最大添加比例
} }
// RawMaterialNutrientDTO 原料营养素响应体 // RawMaterialNutrientDTO 原料营养素响应体
@@ -78,6 +80,7 @@ type RawMaterialResponse struct {
Name string `json:"name"` Name string `json:"name"`
Description string `json:"description"` Description string `json:"description"`
ReferencePrice float32 `json:"reference_price"` // 参考价格(kg/元) ReferencePrice float32 `json:"reference_price"` // 参考价格(kg/元)
MaxAdditionRatio float32 `json:"max_addition_ratio"` // 最大添加比例
RawMaterialNutrients []RawMaterialNutrientDTO `json:"raw_material_nutrients"` // 关联的营养素信息 RawMaterialNutrients []RawMaterialNutrientDTO `json:"raw_material_nutrients"` // 关联的营养素信息
} }

18
internal/domain/recipe/raw_material_service.go
View File

@@ -29,8 +29,8 @@ var (
// RawMaterialService 定义了原料领域的核心业务服务接口 // RawMaterialService 定义了原料领域的核心业务服务接口
type RawMaterialService interface { type RawMaterialService interface {
CreateRawMaterial(ctx context.Context, name, description string, referencePrice float32) (*models.RawMaterial, error) CreateRawMaterial(ctx context.Context, name, description string, referencePrice, maxAdditionRatio float32) (*models.RawMaterial, error)
UpdateRawMaterial(ctx context.Context, id uint32, name, description string, referencePrice float32) (*models.RawMaterial, error) UpdateRawMaterial(ctx context.Context, id uint32, name, description string, referencePrice float32, maxAdditionRatio *float32) (*models.RawMaterial, error)
DeleteRawMaterial(ctx context.Context, id uint32) error DeleteRawMaterial(ctx context.Context, id uint32) error
GetRawMaterial(ctx context.Context, id uint32) (*models.RawMaterial, error) GetRawMaterial(ctx context.Context, id uint32) (*models.RawMaterial, error)
ListRawMaterials(ctx context.Context, opts repository.RawMaterialListOptions, page, pageSize int) ([]models.RawMaterial, int64, error) ListRawMaterials(ctx context.Context, opts repository.RawMaterialListOptions, page, pageSize int) ([]models.RawMaterial, int64, error)
@@ -56,7 +56,7 @@ func NewRawMaterialService(ctx context.Context, uow repository.UnitOfWork, rawMa
} }
// CreateRawMaterial 实现了创建原料的核心业务逻辑 // CreateRawMaterial 实现了创建原料的核心业务逻辑
func (s *rawMaterialServiceImpl) CreateRawMaterial(ctx context.Context, name, description string, referencePrice float32) (*models.RawMaterial, error) { func (s *rawMaterialServiceImpl) CreateRawMaterial(ctx context.Context, name, description string, referencePrice, maxAdditionRatio float32) (*models.RawMaterial, error) {
serviceCtx := logs.AddFuncName(ctx, s.ctx, "CreateRawMaterial") serviceCtx := logs.AddFuncName(ctx, s.ctx, "CreateRawMaterial")
// 检查名称是否已存在 // 检查名称是否已存在
@@ -69,9 +69,10 @@ func (s *rawMaterialServiceImpl) CreateRawMaterial(ctx context.Context, name, de
} }
rawMaterial := &models.RawMaterial{ rawMaterial := &models.RawMaterial{
Name: name, Name: name,
Description: description, Description: description,
ReferencePrice: referencePrice, ReferencePrice: referencePrice,
MaxAdditionRatio: maxAdditionRatio,
} }
if err := s.rawMaterialRepo.CreateRawMaterial(serviceCtx, rawMaterial); err != nil { if err := s.rawMaterialRepo.CreateRawMaterial(serviceCtx, rawMaterial); err != nil {
@@ -82,7 +83,7 @@ func (s *rawMaterialServiceImpl) CreateRawMaterial(ctx context.Context, name, de
} }
// UpdateRawMaterial 实现了更新原料的核心业务逻辑 // UpdateRawMaterial 实现了更新原料的核心业务逻辑
func (s *rawMaterialServiceImpl) UpdateRawMaterial(ctx context.Context, id uint32, name, description string, referencePrice float32) (*models.RawMaterial, error) { func (s *rawMaterialServiceImpl) UpdateRawMaterial(ctx context.Context, id uint32, name, description string, referencePrice float32, maxAdditionRatio *float32) (*models.RawMaterial, error) {
serviceCtx := logs.AddFuncName(ctx, s.ctx, "UpdateRawMaterial") serviceCtx := logs.AddFuncName(ctx, s.ctx, "UpdateRawMaterial")
// 检查要更新的实体是否存在 // 检查要更新的实体是否存在
@@ -108,6 +109,9 @@ func (s *rawMaterialServiceImpl) UpdateRawMaterial(ctx context.Context, id uint3
rawMaterial.Name = name rawMaterial.Name = name
rawMaterial.Description = description rawMaterial.Description = description
rawMaterial.ReferencePrice = referencePrice rawMaterial.ReferencePrice = referencePrice
if maxAdditionRatio != nil {
rawMaterial.MaxAdditionRatio = *maxAdditionRatio
}
if err := s.rawMaterialRepo.UpdateRawMaterial(serviceCtx, rawMaterial); err != nil { if err := s.rawMaterialRepo.UpdateRawMaterial(serviceCtx, rawMaterial); err != nil {
return nil, fmt.Errorf("更新原料失败: %w", err) return nil, fmt.Errorf("更新原料失败: %w", err)

7
internal/infra/repository/raw_material_repository.go
View File

@@ -144,9 +144,10 @@ func (r *gormRawMaterialRepository) UpdateRawMaterial(ctx context.Context, rawMa
repoCtx := logs.AddFuncName(ctx, r.ctx, "UpdateRawMaterial") repoCtx := logs.AddFuncName(ctx, r.ctx, "UpdateRawMaterial")
// 使用 map 更新以避免 GORM 的零值问题，并确保只更新指定字段 // 使用 map 更新以避免 GORM 的零值问题，并确保只更新指定字段
updateData := map[string]interface{}{ updateData := map[string]interface{}{
"name": rawMaterial.Name, "name": rawMaterial.Name,
"description": rawMaterial.Description, "description": rawMaterial.Description,
"reference_price": rawMaterial.ReferencePrice, "reference_price": rawMaterial.ReferencePrice,
"max_addition_ratio": rawMaterial.MaxAdditionRatio,
} }
result := r.db.WithContext(repoCtx).Model(&models.RawMaterial{}).Where("id = ?", rawMaterial.ID).Updates(updateData) result := r.db.WithContext(repoCtx).Model(&models.RawMaterial{}).Where("id = ?", rawMaterial.ID).Updates(updateData)
if result.Error != nil { if result.Error != nil {