简化控制器层重复代码

2025-10-06 23:48:31 +08:00
parent 5e84b473f6
commit 21661eb748
5 changed files with 477 additions and 475 deletions
--- a/internal/app/controller/management/pig_batch_health_controller.go
+++ b/internal/app/controller/management/pig_batch_health_controller.go
@@ -1,12 +1,7 @@
 package management

 import (
-	"errors"
-	"strconv"
-
-	"git.huangwc.com/pig/pig-farm-controller/internal/app/controller"
 	"git.huangwc.com/pig/pig-farm-controller/internal/app/dto"
-	"git.huangwc.com/pig/pig-farm-controller/internal/app/service"
 	"github.com/gin-gonic/gin"
 )

@@ -22,35 +17,16 @@ import (
 // @Router       /api/v1/pig-batches/{id}/record-sick-pigs [post]
 func (c *PigBatchController) RecordSickPigs(ctx *gin.Context) {
 	const action = "记录新增病猪事件"
-	batchID, err := strconv.ParseUint(ctx.Param("id"), 10, 32)
-	if err != nil {
-		controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的猪批次ID格式", action, "ID格式错误", ctx.Param("id"))
-		return
-	}
-
 	var req dto.RecordSickPigsRequest
-	if err := ctx.ShouldBindJSON(&req); err != nil {
-		controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的请求体", action, "请求体绑定失败", req)
-		return
-	}

-	operatorID, err := controller.GetOperatorIDFromContext(ctx)
-
-	err = c.service.RecordSickPigs(operatorID, uint(batchID), req.PenID, req.Quantity, req.TreatmentLocation, req.HappenedAt, req.Remarks)
-	if err != nil {
-		if errors.Is(err, service.ErrPigBatchNotFound) || errors.Is(err, service.ErrPenNotFound) {
-			controller.SendErrorWithAudit(ctx, controller.CodeNotFound, err.Error(), action, err.Error(), batchID)
-			return
-		} else if errors.Is(err, service.ErrInvalidOperation) || errors.Is(err, service.ErrPigBatchNotActive) || errors.Is(err, service.ErrPenNotAssociatedWithBatch) || errors.Is(err, service.ErrPenNotEmpty) {
-			controller.SendErrorWithAudit(ctx, controller.CodeConflict, err.Error(), action, err.Error(), batchID)
-			return
-		}
-		c.logger.Errorf("%s: 业务逻辑失败: %v", action, err)
-		controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "记录新增病猪事件失败", action, err.Error(), batchID)
-		return
-	}
-
-	controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "记录成功", nil, action, "记录成功", batchID)
+	handleAPIRequest(
+		c, ctx, action, &req,
+		func(ctx *gin.Context, operatorID uint, primaryID uint, req *dto.RecordSickPigsRequest) error {
+			return c.service.RecordSickPigs(operatorID, primaryID, req.PenID, req.Quantity, req.TreatmentLocation, req.HappenedAt, req.Remarks)
+		},
+		"记录成功",
+		nil, // 默认从 ":id" 路径参数提取ID
+	)
 }

 // RecordSickPigRecovery godoc
@@ -65,35 +41,16 @@ func (c *PigBatchController) RecordSickPigs(ctx *gin.Context) {
 // @Router       /api/v1/pig-batches/{id}/record-sick-pig-recovery [post]
 func (c *PigBatchController) RecordSickPigRecovery(ctx *gin.Context) {
 	const action = "记录病猪康复事件"
-	batchID, err := strconv.ParseUint(ctx.Param("id"), 10, 32)
-	if err != nil {
-		controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的猪批次ID格式", action, "ID格式错误", ctx.Param("id"))
-		return
-	}
-
 	var req dto.RecordSickPigRecoveryRequest
-	if err := ctx.ShouldBindJSON(&req); err != nil {
-		controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的请求体", action, "请求体绑定失败", req)
-		return
-	}

-	operatorID, err := controller.GetOperatorIDFromContext(ctx)
-
-	err = c.service.RecordSickPigRecovery(operatorID, uint(batchID), req.PenID, req.Quantity, req.TreatmentLocation, req.HappenedAt, req.Remarks)
-	if err != nil {
-		if errors.Is(err, service.ErrPigBatchNotFound) || errors.Is(err, service.ErrPenNotFound) {
-			controller.SendErrorWithAudit(ctx, controller.CodeNotFound, err.Error(), action, err.Error(), batchID)
-			return
-		} else if errors.Is(err, service.ErrInvalidOperation) || errors.Is(err, service.ErrPigBatchNotActive) || errors.Is(err, service.ErrPenNotAssociatedWithBatch) || errors.Is(err, service.ErrPenNotEmpty) {
-			controller.SendErrorWithAudit(ctx, controller.CodeConflict, err.Error(), action, err.Error(), batchID)
-			return
-		}
-		c.logger.Errorf("%s: 业务逻辑失败: %v", action, err)
-		controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "记录病猪康复事件失败", action, err.Error(), batchID)
-		return
-	}
-
-	controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "记录成功", nil, action, "记录成功", batchID)
+	handleAPIRequest(
+		c, ctx, action, &req,
+		func(ctx *gin.Context, operatorID uint, primaryID uint, req *dto.RecordSickPigRecoveryRequest) error {
+			return c.service.RecordSickPigRecovery(operatorID, primaryID, req.PenID, req.Quantity, req.TreatmentLocation, req.HappenedAt, req.Remarks)
+		},
+		"记录成功",
+		nil, // 默认从 ":id" 路径参数提取ID
+	)
 }

 // RecordSickPigDeath godoc
@@ -108,35 +65,16 @@ func (c *PigBatchController) RecordSickPigRecovery(ctx *gin.Context) {
 // @Router       /api/v1/pig-batches/{id}/record-sick-pig-death [post]
 func (c *PigBatchController) RecordSickPigDeath(ctx *gin.Context) {
 	const action = "记录病猪死亡事件"
-	batchID, err := strconv.ParseUint(ctx.Param("id"), 10, 32)
-	if err != nil {
-		controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的猪批次ID格式", action, "ID格式错误", ctx.Param("id"))
-		return
-	}
-
 	var req dto.RecordSickPigDeathRequest
-	if err := ctx.ShouldBindJSON(&req); err != nil {
-		controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的请求体", action, "请求体绑定失败", req)
-		return
-	}

-	operatorID, err := controller.GetOperatorIDFromContext(ctx)
-
-	err = c.service.RecordSickPigDeath(operatorID, uint(batchID), req.PenID, req.Quantity, req.TreatmentLocation, req.HappenedAt, req.Remarks)
-	if err != nil {
-		if errors.Is(err, service.ErrPigBatchNotFound) || errors.Is(err, service.ErrPenNotFound) {
-			controller.SendErrorWithAudit(ctx, controller.CodeNotFound, err.Error(), action, err.Error(), batchID)
-			return
-		} else if errors.Is(err, service.ErrInvalidOperation) || errors.Is(err, service.ErrPigBatchNotActive) || errors.Is(err, service.ErrPenNotAssociatedWithBatch) || errors.Is(err, service.ErrPenNotEmpty) {
-			controller.SendErrorWithAudit(ctx, controller.CodeConflict, err.Error(), action, err.Error(), batchID)
-			return
-		}
-		c.logger.Errorf("%s: 业务逻辑失败: %v", action, err)
-		controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "记录病猪死亡事件失败", action, err.Error(), batchID)
-		return
-	}
-
-	controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "记录成功", nil, action, "记录成功", batchID)
+	handleAPIRequest(
+		c, ctx, action, &req,
+		func(ctx *gin.Context, operatorID uint, primaryID uint, req *dto.RecordSickPigDeathRequest) error {
+			return c.service.RecordSickPigDeath(operatorID, primaryID, req.PenID, req.Quantity, req.TreatmentLocation, req.HappenedAt, req.Remarks)
+		},
+		"记录成功",
+		nil, // 默认从 ":id" 路径参数提取ID
+	)
 }

 // RecordSickPigCull godoc
@@ -151,35 +89,16 @@ func (c *PigBatchController) RecordSickPigDeath(ctx *gin.Context) {
 // @Router       /api/v1/pig-batches/{id}/record-sick-pig-cull [post]
 func (c *PigBatchController) RecordSickPigCull(ctx *gin.Context) {
 	const action = "记录病猪淘汰事件"
-	batchID, err := strconv.ParseUint(ctx.Param("id"), 10, 32)
-	if err != nil {
-		controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的猪批次ID格式", action, "ID格式错误", ctx.Param("id"))
-		return
-	}
-
 	var req dto.RecordSickPigCullRequest
-	if err := ctx.ShouldBindJSON(&req); err != nil {
-		controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的请求体", action, "请求体绑定失败", req)
-		return
-	}

-	operatorID, err := controller.GetOperatorIDFromContext(ctx)
-
-	err = c.service.RecordSickPigCull(operatorID, uint(batchID), req.PenID, req.Quantity, req.TreatmentLocation, req.HappenedAt, req.Remarks)
-	if err != nil {
-		if errors.Is(err, service.ErrPigBatchNotFound) || errors.Is(err, service.ErrPenNotFound) {
-			controller.SendErrorWithAudit(ctx, controller.CodeNotFound, err.Error(), action, err.Error(), batchID)
-			return
-		} else if errors.Is(err, service.ErrInvalidOperation) || errors.Is(err, service.ErrPigBatchNotActive) || errors.Is(err, service.ErrPenNotAssociatedWithBatch) || errors.Is(err, service.ErrPenNotEmpty) {
-			controller.SendErrorWithAudit(ctx, controller.CodeConflict, err.Error(), action, err.Error(), batchID)
-			return
-		}
-		c.logger.Errorf("%s: 业务逻辑失败: %v", action, err)
-		controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "记录病猪淘汰事件失败", action, err.Error(), batchID)
-		return
-	}
-
-	controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "记录成功", nil, action, "记录成功", batchID)
+	handleAPIRequest(
+		c, ctx, action, &req,
+		func(ctx *gin.Context, operatorID uint, primaryID uint, req *dto.RecordSickPigCullRequest) error {
+			return c.service.RecordSickPigCull(operatorID, primaryID, req.PenID, req.Quantity, req.TreatmentLocation, req.HappenedAt, req.Remarks)
+		},
+		"记录成功",
+		nil, // 默认从 ":id" 路径参数提取ID
+	)
 }

 // RecordDeath godoc
@@ -194,35 +113,16 @@ func (c *PigBatchController) RecordSickPigCull(ctx *gin.Context) {
 // @Router       /api/v1/pig-batches/{id}/record-death [post]
 func (c *PigBatchController) RecordDeath(ctx *gin.Context) {
 	const action = "记录正常猪只死亡事件"
-	batchID, err := strconv.ParseUint(ctx.Param("id"), 10, 32)
-	if err != nil {
-		controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的猪批次ID格式", action, "ID格式错误", ctx.Param("id"))
-		return
-	}
-
 	var req dto.RecordDeathRequest
-	if err := ctx.ShouldBindJSON(&req); err != nil {
-		controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的请求体", action, "请求体绑定失败", req)
-		return
-	}

-	operatorID, err := controller.GetOperatorIDFromContext(ctx)
-
-	err = c.service.RecordDeath(operatorID, uint(batchID), req.PenID, req.Quantity, req.HappenedAt, req.Remarks)
-	if err != nil {
-		if errors.Is(err, service.ErrPigBatchNotFound) || errors.Is(err, service.ErrPenNotFound) {
-			controller.SendErrorWithAudit(ctx, controller.CodeNotFound, err.Error(), action, err.Error(), batchID)
-			return
-		} else if errors.Is(err, service.ErrInvalidOperation) || errors.Is(err, service.ErrPigBatchNotActive) || errors.Is(err, service.ErrPenNotAssociatedWithBatch) || errors.Is(err, service.ErrPenNotEmpty) {
-			controller.SendErrorWithAudit(ctx, controller.CodeConflict, err.Error(), action, err.Error(), batchID)
-			return
-		}
-		c.logger.Errorf("%s: 业务逻辑失败: %v", action, err)
-		controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "记录正常猪只死亡事件失败", action, err.Error(), batchID)
-		return
-	}
-
-	controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "记录成功", nil, action, "记录成功", batchID)
+	handleAPIRequest(
+		c, ctx, action, &req,
+		func(ctx *gin.Context, operatorID uint, primaryID uint, req *dto.RecordDeathRequest) error {
+			return c.service.RecordDeath(operatorID, primaryID, req.PenID, req.Quantity, req.HappenedAt, req.Remarks)
+		},
+		"记录成功",
+		nil, // 默认从 ":id" 路径参数提取ID
+	)
 }

 // RecordCull godoc
@@ -237,33 +137,14 @@ func (c *PigBatchController) RecordDeath(ctx *gin.Context) {
 // @Router       /api/v1/pig-batches/{id}/record-cull [post]
 func (c *PigBatchController) RecordCull(ctx *gin.Context) {
 	const action = "记录正常猪只淘汰事件"
-	batchID, err := strconv.ParseUint(ctx.Param("id"), 10, 32)
-	if err != nil {
-		controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的猪批次ID格式", action, "ID格式错误", ctx.Param("id"))
-		return
-	}
-
 	var req dto.RecordCullRequest
-	if err := ctx.ShouldBindJSON(&req); err != nil {
-		controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的请求体", action, "请求体绑定失败", req)
-		return
-	}

-	operatorID, err := controller.GetOperatorIDFromContext(ctx)
-
-	err = c.service.RecordCull(operatorID, uint(batchID), req.PenID, req.Quantity, req.HappenedAt, req.Remarks)
-	if err != nil {
-		if errors.Is(err, service.ErrPigBatchNotFound) || errors.Is(err, service.ErrPenNotFound) {
-			controller.SendErrorWithAudit(ctx, controller.CodeNotFound, err.Error(), action, err.Error(), batchID)
-			return
-		} else if errors.Is(err, service.ErrInvalidOperation) || errors.Is(err, service.ErrPigBatchNotActive) || errors.Is(err, service.ErrPenNotAssociatedWithBatch) || errors.Is(err, service.ErrPenNotEmpty) {
-			controller.SendErrorWithAudit(ctx, controller.CodeConflict, err.Error(), action, err.Error(), batchID)
-			return
-		}
-		c.logger.Errorf("%s: 业务逻辑失败: %v", action, err)
-		controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "记录正常猪只淘汰事件失败", action, err.Error(), batchID)
-		return
-	}
-
-	controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "记录成功", nil, action, "记录成功", batchID)
+	handleAPIRequest(
+		c, ctx, action, &req,
+		func(ctx *gin.Context, operatorID uint, primaryID uint, req *dto.RecordCullRequest) error {
+			return c.service.RecordCull(operatorID, primaryID, req.PenID, req.Quantity, req.HappenedAt, req.Remarks)
+		},
+		"记录成功",
+		nil, // 默认从 ":id" 路径参数提取ID
+	)
 }