From 7299c8ebe6fde55240d237bd7132c591450440ce Mon Sep 17 00:00:00 2001 From: huang <1724659546@qq.com> Date: Sat, 18 Oct 2025 15:58:31 +0800 Subject: [PATCH] ListRawMaterialPurchases --- .../controller/monitor/monitor_controller.go | 45 ++++++++++++ internal/app/dto/monitor_dto.go | 68 +++++++++++++++++ internal/app/service/monitor_service.go | 8 ++ .../repository/raw_material_repository.go | 73 +++++++++++++++++++ 4 files changed, 194 insertions(+) create mode 100644 internal/infra/repository/raw_material_repository.go diff --git a/internal/app/controller/monitor/monitor_controller.go b/internal/app/controller/monitor/monitor_controller.go index c431a07..141a009 100644 --- a/internal/app/controller/monitor/monitor_controller.go +++ b/internal/app/controller/monitor/monitor_controller.go @@ -313,3 +313,48 @@ func (c *Controller) ListUserActionLogs(ctx *gin.Context) { c.logger.Infof("%s: 成功, 获取到 %d 条记录, 总计 %d 条", actionType, len(data), total) controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "获取用户操作日志成功", resp, actionType, "获取用户操作日志成功", req) } + +// ListRawMaterialPurchases godoc +// @Summary 获取原料采购记录列表 +// @Description 根据提供的过滤条件，分页获取原料采购记录 +// @Tags 数据监控 +// @Security BearerAuth +// @Produce json +// @Param query query dto.ListRawMaterialPurchaseRequest true "查询参数" +// @Success 200 {object} controller.Response{data=dto.ListRawMaterialPurchaseResponse} +// @Router /api/v1/monitor/raw-material-purchases [get] +func (c *Controller) ListRawMaterialPurchases(ctx *gin.Context) { + const actionType = "获取原料采购记录列表" + + var req dto.ListRawMaterialPurchaseRequest + if err := ctx.ShouldBindQuery(&req); err != nil { + c.logger.Errorf("%s: 参数绑定失败: %v", actionType, err) + controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的查询参数: "+err.Error(), actionType, "参数绑定失败", req) + return + } + + opts := repository.RawMaterialPurchaseListOptions{ + RawMaterialID: req.RawMaterialID, + Supplier: req.Supplier, + OrderBy: req.OrderBy, + StartTime: req.StartTime, + EndTime: req.EndTime, + } + + data, total, err := c.monitorService.ListRawMaterialPurchases(opts, req.Page, req.PageSize) + if err != nil { + if errors.Is(err, repository.ErrInvalidPagination) { + c.logger.Warnf("%s: 无效的分页参数: %v", actionType, err) + controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的分页参数: "+err.Error(), actionType, "无效分页参数", req) + return + } + + c.logger.Errorf("%s: 服务层查询失败: %v", actionType, err) + controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "获取原料采购记录失败: "+err.Error(), actionType, "服务层查询失败", req) + return + } + + resp := dto.NewListRawMaterialPurchaseResponse(data, total, req.Page, req.PageSize) + c.logger.Infof("%s: 成功, 获取到 %d 条记录, 总计 %d 条", actionType, len(data), total) + controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "获取原料采购记录成功", resp, actionType, "获取原料采购记录成功", req) +} diff --git a/internal/app/dto/monitor_dto.go b/internal/app/dto/monitor_dto.go index 1019dba..4ffa266 100644 --- a/internal/app/dto/monitor_dto.go +++ b/internal/app/dto/monitor_dto.go @@ -367,3 +367,71 @@ func NewListUserActionLogResponse(data []models.UserActionLog, total int64, page }, } } + +// --- RawMaterialPurchase --- + +// ListRawMaterialPurchaseRequest 定义了获取原料采购列表的请求参数 +type ListRawMaterialPurchaseRequest struct { + Page int `form:"page,default=1"` + PageSize int `form:"pageSize,default=10"` + RawMaterialID *uint `form:"raw_material_id"` + Supplier *string `form:"supplier"` + StartTime *time.Time `form:"start_time" time_format:"rfc3339"` + EndTime *time.Time `form:"end_time" time_format:"rfc3339"` + OrderBy string `form:"order_by"` +} + +// RawMaterialDTO 是用于API响应的简化版原料结构 +type RawMaterialDTO struct { + ID uint `json:"id"` + Name string `json:"name"` +} + +// RawMaterialPurchaseDTO 是用于API响应的原料采购结构 +type RawMaterialPurchaseDTO struct { + ID uint `json:"id"` + RawMaterialID uint `json:"raw_material_id"` + RawMaterial RawMaterialDTO `json:"raw_material"` + Supplier string `json:"supplier"` + Amount float64 `json:"amount"` + UnitPrice float64 `json:"unit_price"` + TotalPrice float64 `json:"total_price"` + PurchaseDate time.Time `json:"purchase_date"` + CreatedAt time.Time `json:"created_at"` +} + +// ListRawMaterialPurchaseResponse 是获取原料采购列表的响应结构 +type ListRawMaterialPurchaseResponse struct { + List []RawMaterialPurchaseDTO `json:"list"` + Pagination PaginationDTO `json:"pagination"` +} + +// NewListRawMaterialPurchaseResponse 从模型数据创建列表响应 DTO +func NewListRawMaterialPurchaseResponse(data []models.RawMaterialPurchase, total int64, page, pageSize int) *ListRawMaterialPurchaseResponse { + dtos := make([]RawMaterialPurchaseDTO, len(data)) + for i, item := range data { + dtos[i] = RawMaterialPurchaseDTO{ + ID: item.ID, + RawMaterialID: item.RawMaterialID, + RawMaterial: RawMaterialDTO{ + ID: item.RawMaterial.ID, + Name: item.RawMaterial.Name, + }, + Supplier: item.Supplier, + Amount: item.Amount, + UnitPrice: item.UnitPrice, + TotalPrice: item.TotalPrice, + PurchaseDate: item.PurchaseDate, + CreatedAt: item.CreatedAt, + } + } + + return &ListRawMaterialPurchaseResponse{ + List: dtos, + Pagination: PaginationDTO{ + Total: total, + Page: page, + PageSize: pageSize, + }, + } +} diff --git a/internal/app/service/monitor_service.go b/internal/app/service/monitor_service.go index 60be8e1..68da3bc 100644 --- a/internal/app/service/monitor_service.go +++ b/internal/app/service/monitor_service.go @@ -12,6 +12,7 @@ type MonitorService struct { executionLogRepo repository.ExecutionLogRepository pendingCollectionRepo repository.PendingCollectionRepository userActionLogRepo repository.UserActionLogRepository + rawMaterialRepo repository.RawMaterialRepository // 在这里可以添加其他超表模型的仓库依赖 } @@ -22,6 +23,7 @@ func NewMonitorService( executionLogRepo repository.ExecutionLogRepository, pendingCollectionRepo repository.PendingCollectionRepository, userActionLogRepo repository.UserActionLogRepository, + rawMaterialRepo repository.RawMaterialRepository, ) *MonitorService { return &MonitorService{ sensorDataRepo: sensorDataRepo, @@ -29,6 +31,7 @@ func NewMonitorService( executionLogRepo: executionLogRepo, pendingCollectionRepo: pendingCollectionRepo, userActionLogRepo: userActionLogRepo, + rawMaterialRepo: rawMaterialRepo, } } @@ -61,3 +64,8 @@ func (s *MonitorService) ListPendingCollections(opts repository.PendingCollectio func (s *MonitorService) ListUserActionLogs(opts repository.UserActionLogListOptions, page, pageSize int) ([]models.UserActionLog, int64, error) { return s.userActionLogRepo.List(opts, page, pageSize) } + +// ListRawMaterialPurchases 负责处理查询原料采购记录列表的业务逻辑 +func (s *MonitorService) ListRawMaterialPurchases(opts repository.RawMaterialPurchaseListOptions, page, pageSize int) ([]models.RawMaterialPurchase, int64, error) { + return s.rawMaterialRepo.ListRawMaterialPurchases(opts, page, pageSize) +} diff --git a/internal/infra/repository/raw_material_repository.go b/internal/infra/repository/raw_material_repository.go new file mode 100644 index 0000000..007598e --- /dev/null +++ b/internal/infra/repository/raw_material_repository.go @@ -0,0 +1,73 @@ +package repository + +import ( + "time" + + "git.huangwc.com/pig/pig-farm-controller/internal/infra/models" + "gorm.io/gorm" +) + +// RawMaterialPurchaseListOptions 定义了查询原料采购记录时的可选参数 +type RawMaterialPurchaseListOptions struct { + RawMaterialID *uint + Supplier *string + StartTime *time.Time // 基于 purchase_date 字段 + EndTime *time.Time // 基于 purchase_date 字段 + OrderBy string // 例如 "purchase_date asc" +} + +// RawMaterialRepository 定义了与原料相关的数据库操作接口 +type RawMaterialRepository interface { + // ListRawMaterialPurchases 支持分页和过滤的列表查询 + ListRawMaterialPurchases(opts RawMaterialPurchaseListOptions, page, pageSize int) ([]models.RawMaterialPurchase, int64, error) +} + +// gormRawMaterialRepository 是 RawMaterialRepository 的 GORM 实现 +type gormRawMaterialRepository struct { + db *gorm.DB +} + +// NewGormRawMaterialRepository 创建一个新的 RawMaterialRepository GORM 实现实例 +func NewGormRawMaterialRepository(db *gorm.DB) RawMaterialRepository { + return &gormRawMaterialRepository{db: db} +} + +// ListRawMaterialPurchases 实现了分页和过滤查询原料采购记录的功能 +func (r *gormRawMaterialRepository) ListRawMaterialPurchases(opts RawMaterialPurchaseListOptions, page, pageSize int) ([]models.RawMaterialPurchase, int64, error) { + if page <= 0 || pageSize <= 0 { + return nil, 0, ErrInvalidPagination + } + + var results []models.RawMaterialPurchase + var total int64 + + query := r.db.Model(&models.RawMaterialPurchase{}) + + if opts.RawMaterialID != nil { + query = query.Where("raw_material_id = ?", *opts.RawMaterialID) + } + if opts.Supplier != nil { + query = query.Where("supplier LIKE ?", "%"+*opts.Supplier+"%") + } + if opts.StartTime != nil { + query = query.Where("purchase_date >= ?", *opts.StartTime) + } + if opts.EndTime != nil { + query = query.Where("purchase_date <= ?", *opts.EndTime) + } + + if err := query.Count(&total).Error; err != nil { + return nil, 0, err + } + + orderBy := "purchase_date DESC" + if opts.OrderBy != "" { + orderBy = opts.OrderBy + } + query = query.Order(orderBy).Preload("RawMaterial") + + offset := (page - 1) * pageSize + err := query.Limit(pageSize).Offset(offset).Find(&results).Error + + return results, total, err +}