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

修改controller包

Browse Source
This commit is contained in:
huang
2025-11-05 17:24:19 +08:00
parent 4cae93ef34
commit ef4ca397ce
11 changed files with 449 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
internal/app/controller/management/pig_batch_controller.go
View File

@@ -1,25 +1,25 @@
package management
import (
"context"
"strconv"
"git.huangwc.com/pig/pig-farm-controller/internal/app/dto"
"git.huangwc.com/pig/pig-farm-controller/internal/app/service"
"git.huangwc.com/pig/pig-farm-controller/internal/infra/logs"
"github.com/labstack/echo/v4"
)
// PigBatchController 负责处理猪批次相关的API请求
type PigBatchController struct {
logger *logs.Logger
ctx context.Context
service service.PigBatchService
}
// NewPigBatchController 创建一个新的 PigBatchController 实例
func NewPigBatchController(logger *logs.Logger, service service.PigBatchService) *PigBatchController {
func NewPigBatchController(ctx context.Context, service service.PigBatchService) *PigBatchController {
return &PigBatchController{
logger: logger,
ctx: ctx,
service: service,
}
}
@@ -35,6 +35,8 @@ func NewPigBatchController(logger *logs.Logger, service service.PigBatchService)
// @Success 201 {object} controller.Response{data=dto.PigBatchResponseDTO} "创建成功"
// @Router /api/v1/pig-batches [post]
func (c *PigBatchController) CreatePigBatch(ctx echo.Context) error {
reqCtx := logs.AddFuncName(ctx.Request().Context(), c.ctx, "CreatePigBatch")
const action = "创建猪批次"
var req dto.PigBatchCreateDTO
@@ -42,7 +44,7 @@ func (c *PigBatchController) CreatePigBatch(ctx echo.Context) error {
c, ctx, action, &req,
func(ctx echo.Context, operatorID uint, primaryID uint, req *dto.PigBatchCreateDTO) (*dto.PigBatchResponseDTO, error) {
// 对于创建操作，primaryID通常不从路径中获取，而是由服务层生成
return c.service.CreatePigBatch(operatorID, req)
return c.service.CreatePigBatch(reqCtx, operatorID, req)
},
"创建成功",
nil, // 无需自定义ID提取器，primaryID将为0
@@ -59,12 +61,14 @@ func (c *PigBatchController) CreatePigBatch(ctx echo.Context) error {
// @Success 200 {object} controller.Response{data=dto.PigBatchResponseDTO} "获取成功"
// @Router /api/v1/pig-batches/{id} [get]
func (c *PigBatchController) GetPigBatch(ctx echo.Context) error {
reqCtx := logs.AddFuncName(ctx.Request().Context(), c.ctx, "GetPigBatch")
const action = "获取猪批次"
return handleNoBodyAPIRequestWithResponse(
c, ctx, action,
func(ctx echo.Context, operatorID uint, primaryID uint) (*dto.PigBatchResponseDTO, error) {
return c.service.GetPigBatch(primaryID)
return c.service.GetPigBatch(reqCtx, primaryID)
},
"获取成功",
nil, // 默认从 ":id" 路径参数提取ID
@@ -83,13 +87,15 @@ func (c *PigBatchController) GetPigBatch(ctx echo.Context) error {
// @Success 200 {object} controller.Response{data=dto.PigBatchResponseDTO} "更新成功"
// @Router /api/v1/pig-batches/{id} [put]
func (c *PigBatchController) UpdatePigBatch(ctx echo.Context) error {
reqCtx := logs.AddFuncName(ctx.Request().Context(), c.ctx, "UpdatePigBatch")
const action = "更新猪批次"
var req dto.PigBatchUpdateDTO
return handleAPIRequestWithResponse(
c, ctx, action, &req,
func(ctx echo.Context, operatorID uint, primaryID uint, req *dto.PigBatchUpdateDTO) (*dto.PigBatchResponseDTO, error) {
return c.service.UpdatePigBatch(primaryID, req)
return c.service.UpdatePigBatch(reqCtx, primaryID, req)
},
"更新成功",
nil, // 默认从 ":id" 路径参数提取ID
@@ -106,12 +112,14 @@ func (c *PigBatchController) UpdatePigBatch(ctx echo.Context) error {
// @Success 200 {object} controller.Response "删除成功"
// @Router /api/v1/pig-batches/{id} [delete]
func (c *PigBatchController) DeletePigBatch(ctx echo.Context) error {
reqCtx := logs.AddFuncName(ctx.Request().Context(), c.ctx, "DeletePigBatch")
const action = "删除猪批次"
return handleNoBodyAPIRequest(
c, ctx, action,
func(ctx echo.Context, operatorID uint, primaryID uint) error {
return c.service.DeletePigBatch(primaryID)
return c.service.DeletePigBatch(reqCtx, primaryID)
},
"删除成功",
nil, // 默认从 ":id" 路径参数提取ID
@@ -128,13 +136,15 @@ func (c *PigBatchController) DeletePigBatch(ctx echo.Context) error {
// @Success 200 {object} controller.Response{data=[]dto.PigBatchResponseDTO} "获取成功"
// @Router /api/v1/pig-batches [get]
func (c *PigBatchController) ListPigBatches(ctx echo.Context) error {
reqCtx := logs.AddFuncName(ctx.Request().Context(), c.ctx, "ListPigBatches")
const action = "获取猪批次列表"
var query dto.PigBatchQueryDTO
return handleQueryAPIRequestWithResponse(
c, ctx, action, &query,
func(ctx echo.Context, operatorID uint, query *dto.PigBatchQueryDTO) ([]*dto.PigBatchResponseDTO, error) {
return c.service.ListPigBatches(query.IsActive)
return c.service.ListPigBatches(reqCtx, query.IsActive)
},
"获取成功",
)
@@ -152,13 +162,15 @@ func (c *PigBatchController) ListPigBatches(ctx echo.Context) error {
// @Success 200 {object} controller.Response "分配成功"
// @Router /api/v1/pig-batches/assign-pens/{id} [post]
func (c *PigBatchController) AssignEmptyPensToBatch(ctx echo.Context) error {
reqCtx := logs.AddFuncName(ctx.Request().Context(), c.ctx, "AssignEmptyPensToBatch")
const action = "为猪批次分配空栏"
var req dto.AssignEmptyPensToBatchRequest
return handleAPIRequest(
c, ctx, action, &req,
func(ctx echo.Context, operatorID uint, primaryID uint, req *dto.AssignEmptyPensToBatchRequest) error {
return c.service.AssignEmptyPensToBatch(primaryID, req.PenIDs, operatorID)
return c.service.AssignEmptyPensToBatch(reqCtx, primaryID, req.PenIDs, operatorID)
},
"分配成功",
nil, // 默认从 ":id" 路径参数提取ID
@@ -177,6 +189,8 @@ func (c *PigBatchController) AssignEmptyPensToBatch(ctx echo.Context) error {
// @Success 200 {object} controller.Response "划拨成功"
// @Router /api/v1/pig-batches/reclassify-pen/{fromBatchID} [post]
func (c *PigBatchController) ReclassifyPenToNewBatch(ctx echo.Context) error {
reqCtx := logs.AddFuncName(ctx.Request().Context(), c.ctx, "ReclassifyPenToNewBatch")
const action = "划拨猪栏到新批次"
var req dto.ReclassifyPenToNewBatchRequest
@@ -184,7 +198,7 @@ func (c *PigBatchController) ReclassifyPenToNewBatch(ctx echo.Context) error {
c, ctx, action, &req,
func(ctx echo.Context, operatorID uint, primaryID uint, req *dto.ReclassifyPenToNewBatchRequest) error {
// primaryID 在这里是 fromBatchID
return c.service.ReclassifyPenToNewBatch(primaryID, req.ToBatchID, req.PenID, operatorID, req.Remarks)
return c.service.ReclassifyPenToNewBatch(reqCtx, primaryID, req.ToBatchID, req.PenID, operatorID, req.Remarks)
},
"划拨成功",
func(ctx echo.Context) (uint, error) { // 自定义ID提取器，从 ":fromBatchID" 路径参数提取
@@ -209,6 +223,8 @@ func (c *PigBatchController) ReclassifyPenToNewBatch(ctx echo.Context) error {
// @Success 200 {object} controller.Response "移除成功"
// @Router /api/v1/pig-batches/remove-pen/{penID}/{batchID} [delete]
func (c *PigBatchController) RemoveEmptyPenFromBatch(ctx echo.Context) error {
reqCtx := logs.AddFuncName(ctx.Request().Context(), c.ctx, "RemoveEmptyPenFromBatch")
const action = "从猪批次移除空栏"
return handleNoBodyAPIRequest(
@@ -220,7 +236,7 @@ func (c *PigBatchController) RemoveEmptyPenFromBatch(ctx echo.Context) error {
if err != nil {
return err // 返回错误，因为 penID 格式无效
}
return c.service.RemoveEmptyPenFromBatch(primaryID, uint(parsedPenID))
return c.service.RemoveEmptyPenFromBatch(reqCtx, primaryID, uint(parsedPenID))
},
"移除成功",
func(ctx echo.Context) (uint, error) { // 自定义ID提取器，从 ":batchID" 路径参数提取
@@ -246,13 +262,15 @@ func (c *PigBatchController) RemoveEmptyPenFromBatch(ctx echo.Context) error {
// @Success 200 {object} controller.Response "移入成功"
// @Router /api/v1/pig-batches/move-pigs-into-pen/{id} [post]
func (c *PigBatchController) MovePigsIntoPen(ctx echo.Context) error {
reqCtx := logs.AddFuncName(ctx.Request().Context(), c.ctx, "MovePigsIntoPen")
const action = "将猪只移入猪栏"
var req dto.MovePigsIntoPenRequest
return handleAPIRequest(
c, ctx, action, &req,
func(ctx echo.Context, operatorID uint, primaryID uint, req *dto.MovePigsIntoPenRequest) error {
return c.service.MovePigsIntoPen(primaryID, req.ToPenID, req.Quantity, operatorID, req.Remarks)
return c.service.MovePigsIntoPen(reqCtx, primaryID, req.ToPenID, req.Quantity, operatorID, req.Remarks)
},
"移入成功",
nil, // 默认从 ":id" 路径参数提取ID