任务2.1

2025-10-31 15:10:09 +08:00
parent 8d8310fd2c
commit 9f3e800e59
3 changed files with 387 additions and 319 deletions
--- a/internal/app/controller/monitor/monitor_controller.go
+++ b/internal/app/controller/monitor/monitor_controller.go
@@ -7,7 +7,6 @@ import (
 	"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"
-	"git.huangwc.com/pig/pig-farm-controller/internal/infra/models"
 	"git.huangwc.com/pig/pig-farm-controller/internal/infra/repository"
 	"github.com/labstack/echo/v4"
 )
@@ -44,18 +43,7 @@ func (c *Controller) ListSensorData(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的查询参数: "+err.Error(), actionType, "参数绑定失败", req)
 	}

-	opts := repository.SensorDataListOptions{
-		DeviceID:  req.DeviceID,
-		OrderBy:   req.OrderBy,
-		StartTime: req.StartTime,
-		EndTime:   req.EndTime,
-	}
-	if req.SensorType != nil {
-		sensorType := models.SensorType(*req.SensorType)
-		opts.SensorType = &sensorType
-	}
-
-	data, total, err := c.monitorService.ListSensorData(opts, req.Page, req.PageSize)
+	resp, err := c.monitorService.ListSensorData(&req)
 	if err != nil {
 		if errors.Is(err, repository.ErrInvalidPagination) {
 			c.logger.Warnf("%s: 无效的分页参数: %v", actionType, err)
@@ -66,8 +54,7 @@ func (c *Controller) ListSensorData(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "获取传感器数据失败: "+err.Error(), actionType, "服务层查询失败", req)
 	}

-	resp := dto.NewListSensorDataResponse(data, total, req.Page, req.PageSize)
-	c.logger.Infof("%s: 成功, 获取到 %d 条记录, 总计 %d 条", actionType, len(data), total)
+	c.logger.Infof("%s: 成功, 获取到 %d 条记录, 总计 %d 条", actionType, len(resp.List), resp.Pagination.Total)
 	return controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "获取传感器数据成功", resp, actionType, "获取传感器数据成功", req)
 }

@@ -89,15 +76,7 @@ func (c *Controller) ListDeviceCommandLogs(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的查询参数: "+err.Error(), actionType, "参数绑定失败", req)
 	}

-	opts := repository.DeviceCommandLogListOptions{
-		DeviceID:        req.DeviceID,
-		ReceivedSuccess: req.ReceivedSuccess,
-		OrderBy:         req.OrderBy,
-		StartTime:       req.StartTime,
-		EndTime:         req.EndTime,
-	}
-
-	data, total, err := c.monitorService.ListDeviceCommandLogs(opts, req.Page, req.PageSize)
+	resp, err := c.monitorService.ListDeviceCommandLogs(&req)
 	if err != nil {
 		if errors.Is(err, repository.ErrInvalidPagination) {
 			c.logger.Warnf("%s: 无效的分页参数: %v", actionType, err)
@@ -108,8 +87,7 @@ func (c *Controller) ListDeviceCommandLogs(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "获取设备命令日志失败: "+err.Error(), actionType, "服务层查询失败", req)
 	}

-	resp := dto.NewListDeviceCommandLogResponse(data, total, req.Page, req.PageSize)
-	c.logger.Infof("%s: 成功, 获取到 %d 条记录, 总计 %d 条", actionType, len(data), total)
+	c.logger.Infof("%s: 成功, 获取到 %d 条记录, 总计 %d 条", actionType, len(resp.List), resp.Pagination.Total)
 	return controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "获取设备命令日志成功", resp, actionType, "获取设备命令日志成功", req)
 }

@@ -131,18 +109,7 @@ func (c *Controller) ListPlanExecutionLogs(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的查询参数: "+err.Error(), actionType, "参数绑定失败", req)
 	}

-	opts := repository.PlanExecutionLogListOptions{
-		PlanID:    req.PlanID,
-		OrderBy:   req.OrderBy,
-		StartTime: req.StartTime,
-		EndTime:   req.EndTime,
-	}
-	if req.Status != nil {
-		status := models.ExecutionStatus(*req.Status)
-		opts.Status = &status
-	}
-
-	planLogs, plans, total, err := c.monitorService.ListPlanExecutionLogs(opts, req.Page, req.PageSize)
+	resp, err := c.monitorService.ListPlanExecutionLogs(&req)
 	if err != nil {
 		if errors.Is(err, repository.ErrInvalidPagination) {
 			c.logger.Warnf("%s: 无效的分页参数: %v", actionType, err)
@@ -153,8 +120,7 @@ func (c *Controller) ListPlanExecutionLogs(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "获取计划执行日志失败: "+err.Error(), actionType, "服务层查询失败", req)
 	}

-	resp := dto.NewListPlanExecutionLogResponse(planLogs, plans, total, req.Page, req.PageSize)
-	c.logger.Infof("%s: 成功, 获取到 %d 条记录, 总计 %d 条", actionType, len(planLogs), total)
+	c.logger.Infof("%s: 成功, 获取到 %d 条记录, 总计 %d 条", actionType, len(resp.List), resp.Pagination.Total)
 	return controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "获取计划执行日志成功", resp, actionType, "获取计划执行日志成功", req)
 }

@@ -176,19 +142,7 @@ func (c *Controller) ListTaskExecutionLogs(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的查询参数: "+err.Error(), actionType, "参数绑定失败", req)
 	}

-	opts := repository.TaskExecutionLogListOptions{
-		PlanExecutionLogID: req.PlanExecutionLogID,
-		TaskID:             req.TaskID,
-		OrderBy:            req.OrderBy,
-		StartTime:          req.StartTime,
-		EndTime:            req.EndTime,
-	}
-	if req.Status != nil {
-		status := models.ExecutionStatus(*req.Status)
-		opts.Status = &status
-	}
-
-	data, total, err := c.monitorService.ListTaskExecutionLogs(opts, req.Page, req.PageSize)
+	resp, err := c.monitorService.ListTaskExecutionLogs(&req)
 	if err != nil {
 		if errors.Is(err, repository.ErrInvalidPagination) {
 			c.logger.Warnf("%s: 无效的分页参数: %v", actionType, err)
@@ -199,8 +153,7 @@ func (c *Controller) ListTaskExecutionLogs(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "获取任务执行日志失败: "+err.Error(), actionType, "服务层查询失败", req)
 	}

-	resp := dto.NewListTaskExecutionLogResponse(data, total, req.Page, req.PageSize)
-	c.logger.Infof("%s: 成功, 获取到 %d 条记录, 总计 %d 条", actionType, len(data), total)
+	c.logger.Infof("%s: 成功, 获取到 %d 条记录, 总计 %d 条", actionType, len(resp.List), resp.Pagination.Total)
 	return controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "获取任务执行日志成功", resp, actionType, "获取任务执行日志成功", req)
 }

@@ -222,18 +175,7 @@ func (c *Controller) ListPendingCollections(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的查询参数: "+err.Error(), actionType, "参数绑定失败", req)
 	}

-	opts := repository.PendingCollectionListOptions{
-		DeviceID:  req.DeviceID,
-		OrderBy:   req.OrderBy,
-		StartTime: req.StartTime,
-		EndTime:   req.EndTime,
-	}
-	if req.Status != nil {
-		status := models.PendingCollectionStatus(*req.Status)
-		opts.Status = &status
-	}
-
-	data, total, err := c.monitorService.ListPendingCollections(opts, req.Page, req.PageSize)
+	resp, err := c.monitorService.ListPendingCollections(&req)
 	if err != nil {
 		if errors.Is(err, repository.ErrInvalidPagination) {
 			c.logger.Warnf("%s: 无效的分页参数: %v", actionType, err)
@@ -244,8 +186,7 @@ func (c *Controller) ListPendingCollections(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "获取待采集请求失败: "+err.Error(), actionType, "服务层查询失败", req)
 	}

-	resp := dto.NewListPendingCollectionResponse(data, total, req.Page, req.PageSize)
-	c.logger.Infof("%s: 成功, 获取到 %d 条记录, 总计 %d 条", actionType, len(data), total)
+	c.logger.Infof("%s: 成功, 获取到 %d 条记录, 总计 %d 条", actionType, len(resp.List), resp.Pagination.Total)
 	return controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "获取待采集请求成功", resp, actionType, "获取待采集请求成功", req)
 }

@@ -267,20 +208,7 @@ func (c *Controller) ListUserActionLogs(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的查询参数: "+err.Error(), actionType, "参数绑定失败", req)
 	}

-	opts := repository.UserActionLogListOptions{
-		UserID:     req.UserID,
-		Username:   req.Username,
-		ActionType: req.ActionType,
-		OrderBy:    req.OrderBy,
-		StartTime:  req.StartTime,
-		EndTime:    req.EndTime,
-	}
-	if req.Status != nil {
-		status := models.AuditStatus(*req.Status)
-		opts.Status = &status
-	}
-
-	data, total, err := c.monitorService.ListUserActionLogs(opts, req.Page, req.PageSize)
+	resp, err := c.monitorService.ListUserActionLogs(&req)
 	if err != nil {
 		if errors.Is(err, repository.ErrInvalidPagination) {
 			c.logger.Warnf("%s: 无效的分页参数: %v", actionType, err)
@@ -291,8 +219,7 @@ func (c *Controller) ListUserActionLogs(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "获取用户操作日志失败: "+err.Error(), actionType, "服务层查询失败", req)
 	}

-	resp := dto.NewListUserActionLogResponse(data, total, req.Page, req.PageSize)
-	c.logger.Infof("%s: 成功, 获取到 %d 条记录, 总计 %d 条", actionType, len(data), total)
+	c.logger.Infof("%s: 成功, 获取到 %d 条记录, 总计 %d 条", actionType, len(resp.List), resp.Pagination.Total)
 	return controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "获取用户操作日志成功", resp, actionType, "获取用户操作日志成功", req)
 }

@@ -314,15 +241,7 @@ func (c *Controller) ListRawMaterialPurchases(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的查询参数: "+err.Error(), actionType, "参数绑定失败", req)
 	}

-	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)
+	resp, err := c.monitorService.ListRawMaterialPurchases(&req)
 	if err != nil {
 		if errors.Is(err, repository.ErrInvalidPagination) {
 			c.logger.Warnf("%s: 无效的分页参数: %v", actionType, err)
@@ -333,8 +252,7 @@ func (c *Controller) ListRawMaterialPurchases(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "获取原料采购记录失败: "+err.Error(), actionType, "服务层查询失败", req)
 	}

-	resp := dto.NewListRawMaterialPurchaseResponse(data, total, req.Page, req.PageSize)
-	c.logger.Infof("%s: 成功, 获取到 %d 条记录, 总计 %d 条", actionType, len(data), total)
+	c.logger.Infof("%s: 成功, 获取到 %d 条记录, 总计 %d 条", actionType, len(resp.List), resp.Pagination.Total)
 	return controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "获取原料采购记录成功", resp, actionType, "获取原料采购记录成功", req)
 }

@@ -356,19 +274,7 @@ func (c *Controller) ListRawMaterialStockLogs(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的查询参数: "+err.Error(), actionType, "参数绑定失败", req)
 	}

-	opts := repository.RawMaterialStockLogListOptions{
-		RawMaterialID: req.RawMaterialID,
-		SourceID:      req.SourceID,
-		OrderBy:       req.OrderBy,
-		StartTime:     req.StartTime,
-		EndTime:       req.EndTime,
-	}
-	if req.SourceType != nil {
-		sourceType := models.StockLogSourceType(*req.SourceType)
-		opts.SourceType = &sourceType
-	}
-
-	data, total, err := c.monitorService.ListRawMaterialStockLogs(opts, req.Page, req.PageSize)
+	resp, err := c.monitorService.ListRawMaterialStockLogs(&req)
 	if err != nil {
 		if errors.Is(err, repository.ErrInvalidPagination) {
 			c.logger.Warnf("%s: 无效的分页参数: %v", actionType, err)
@@ -379,8 +285,7 @@ func (c *Controller) ListRawMaterialStockLogs(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "获取原料库存日志失败: "+err.Error(), actionType, "服务层查询失败", req)
 	}

-	resp := dto.NewListRawMaterialStockLogResponse(data, total, req.Page, req.PageSize)
-	c.logger.Infof("%s: 成功, 获取到 %d 条记录, 总计 %d 条", actionType, len(data), total)
+	c.logger.Infof("%s: 成功, 获取到 %d 条记录, 总计 %d 条", actionType, len(resp.List), resp.Pagination.Total)
 	return controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "获取原料库存日志成功", resp, actionType, "获取原料库存日志成功", req)
 }

@@ -402,16 +307,7 @@ func (c *Controller) ListFeedUsageRecords(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的查询参数: "+err.Error(), actionType, "参数绑定失败", req)
 	}

-	opts := repository.FeedUsageRecordListOptions{
-		PenID:         req.PenID,
-		FeedFormulaID: req.FeedFormulaID,
-		OperatorID:    req.OperatorID,
-		OrderBy:       req.OrderBy,
-		StartTime:     req.StartTime,
-		EndTime:       req.EndTime,
-	}
-
-	data, total, err := c.monitorService.ListFeedUsageRecords(opts, req.Page, req.PageSize)
+	resp, err := c.monitorService.ListFeedUsageRecords(&req)
 	if err != nil {
 		if errors.Is(err, repository.ErrInvalidPagination) {
 			c.logger.Warnf("%s: 无效的分页参数: %v", actionType, err)
@@ -422,8 +318,7 @@ func (c *Controller) ListFeedUsageRecords(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "获取饲料使用记录失败: "+err.Error(), actionType, "服务层查询失败", req)
 	}

-	resp := dto.NewListFeedUsageRecordResponse(data, total, req.Page, req.PageSize)
-	c.logger.Infof("%s: 成功, 获取到 %d 条记录, 总计 %d 条", actionType, len(data), total)
+	c.logger.Infof("%s: 成功, 获取到 %d 条记录, 总计 %d 条", actionType, len(resp.List), resp.Pagination.Total)
 	return controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "获取饲料使用记录成功", resp, actionType, "获取饲料使用记录成功", req)
 }

@@ -445,20 +340,7 @@ func (c *Controller) ListMedicationLogs(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的查询参数: "+err.Error(), actionType, "参数绑定失败", req)
 	}

-	opts := repository.MedicationLogListOptions{
-		PigBatchID:   req.PigBatchID,
-		MedicationID: req.MedicationID,
-		OperatorID:   req.OperatorID,
-		OrderBy:      req.OrderBy,
-		StartTime:    req.StartTime,
-		EndTime:      req.EndTime,
-	}
-	if req.Reason != nil {
-		reason := models.MedicationReasonType(*req.Reason)
-		opts.Reason = &reason
-	}
-
-	data, total, err := c.monitorService.ListMedicationLogs(opts, req.Page, req.PageSize)
+	resp, err := c.monitorService.ListMedicationLogs(&req)
 	if err != nil {
 		if errors.Is(err, repository.ErrInvalidPagination) {
 			c.logger.Warnf("%s: 无效的分页参数: %v", actionType, err)
@@ -469,8 +351,7 @@ func (c *Controller) ListMedicationLogs(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "获取用药记录失败: "+err.Error(), actionType, "服务层查询失败", req)
 	}

-	resp := dto.NewListMedicationLogResponse(data, total, req.Page, req.PageSize)
-	c.logger.Infof("%s: 成功, 获取到 %d 条记录, 总计 %d 条", actionType, len(data), total)
+	c.logger.Infof("%s: 成功, 获取到 %d 条记录, 总计 %d 条", actionType, len(resp.List), resp.Pagination.Total)
 	return controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "获取用药记录成功", resp, actionType, "获取用药记录成功", req)
 }

@@ -492,19 +373,7 @@ func (c *Controller) ListPigBatchLogs(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的查询参数: "+err.Error(), actionType, "参数绑定失败", req)
 	}

-	opts := repository.PigBatchLogListOptions{
-		PigBatchID: req.PigBatchID,
-		OperatorID: req.OperatorID,
-		OrderBy:    req.OrderBy,
-		StartTime:  req.StartTime,
-		EndTime:    req.EndTime,
-	}
-	if req.ChangeType != nil {
-		changeType := models.LogChangeType(*req.ChangeType)
-		opts.ChangeType = &changeType
-	}
-
-	data, total, err := c.monitorService.ListPigBatchLogs(opts, req.Page, req.PageSize)
+	resp, err := c.monitorService.ListPigBatchLogs(&req)
 	if err != nil {
 		if errors.Is(err, repository.ErrInvalidPagination) {
 			c.logger.Warnf("%s: 无效的分页参数: %v", actionType, err)
@@ -515,8 +384,7 @@ func (c *Controller) ListPigBatchLogs(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "获取猪批次日志失败: "+err.Error(), actionType, "服务层查询失败", req)
 	}

-	resp := dto.NewListPigBatchLogResponse(data, total, req.Page, req.PageSize)
-	c.logger.Infof("%s: 成功, 获取到 %d 条记录, 总计 %d 条", actionType, len(data), total)
+	c.logger.Infof("%s: 成功, 获取到 %d 条记录, 总计 %d 条", actionType, len(resp.List), resp.Pagination.Total)
 	return controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "获取猪批次日志成功", resp, actionType, "获取猪批次日志成功", req)
 }

@@ -538,14 +406,7 @@ func (c *Controller) ListWeighingBatches(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的查询参数: "+err.Error(), actionType, "参数绑定失败", req)
 	}

-	opts := repository.WeighingBatchListOptions{
-		PigBatchID: req.PigBatchID,
-		OrderBy:    req.OrderBy,
-		StartTime:  req.StartTime,
-		EndTime:    req.EndTime,
-	}
-
-	data, total, err := c.monitorService.ListWeighingBatches(opts, req.Page, req.PageSize)
+	resp, err := c.monitorService.ListWeighingBatches(&req)
 	if err != nil {
 		if errors.Is(err, repository.ErrInvalidPagination) {
 			c.logger.Warnf("%s: 无效的分页参数: %v", actionType, err)
@@ -556,8 +417,7 @@ func (c *Controller) ListWeighingBatches(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "获取批次称重记录失败: "+err.Error(), actionType, "服务层查询失败", req)
 	}

-	resp := dto.NewListWeighingBatchResponse(data, total, req.Page, req.PageSize)
-	c.logger.Infof("%s: 成功, 获取到 %d 条记录, 总计 %d 条", actionType, len(data), total)
+	c.logger.Infof("%s: 成功, 获取到 %d 条记录, 总计 %d 条", actionType, len(resp.List), resp.Pagination.Total)
 	return controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "获取批次称重记录成功", resp, actionType, "获取批次称重记录成功", req)
 }

@@ -579,16 +439,7 @@ func (c *Controller) ListWeighingRecords(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的查询参数: "+err.Error(), actionType, "参数绑定失败", req)
 	}

-	opts := repository.WeighingRecordListOptions{
-		WeighingBatchID: req.WeighingBatchID,
-		PenID:           req.PenID,
-		OperatorID:      req.OperatorID,
-		OrderBy:         req.OrderBy,
-		StartTime:       req.StartTime,
-		EndTime:         req.EndTime,
-	}
-
-	data, total, err := c.monitorService.ListWeighingRecords(opts, req.Page, req.PageSize)
+	resp, err := c.monitorService.ListWeighingRecords(&req)
 	if err != nil {
 		if errors.Is(err, repository.ErrInvalidPagination) {
 			c.logger.Warnf("%s: 无效的分页参数: %v", actionType, err)
@@ -599,8 +450,7 @@ func (c *Controller) ListWeighingRecords(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "获取单次称重记录失败: "+err.Error(), actionType, "服务层查询失败", req)
 	}

-	resp := dto.NewListWeighingRecordResponse(data, total, req.Page, req.PageSize)
-	c.logger.Infof("%s: 成功, 获取到 %d 条记录, 总计 %d 条", actionType, len(data), total)
+	c.logger.Infof("%s: 成功, 获取到 %d 条记录, 总计 %d 条", actionType, len(resp.List), resp.Pagination.Total)
 	return controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "获取单次称重记录成功", resp, actionType, "获取单次称重记录成功", req)
 }

@@ -622,21 +472,7 @@ func (c *Controller) ListPigTransferLogs(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的查询参数: "+err.Error(), actionType, "参数绑定失败", req)
 	}

-	opts := repository.PigTransferLogListOptions{
-		PigBatchID:    req.PigBatchID,
-		PenID:         req.PenID,
-		OperatorID:    req.OperatorID,
-		CorrelationID: req.CorrelationID,
-		OrderBy:       req.OrderBy,
-		StartTime:     req.StartTime,
-		EndTime:       req.EndTime,
-	}
-	if req.TransferType != nil {
-		transferType := models.PigTransferType(*req.TransferType)
-		opts.TransferType = &transferType
-	}
-
-	data, total, err := c.monitorService.ListPigTransferLogs(opts, req.Page, req.PageSize)
+	resp, err := c.monitorService.ListPigTransferLogs(&req)
 	if err != nil {
 		if errors.Is(err, repository.ErrInvalidPagination) {
 			c.logger.Warnf("%s: 无效的分页参数: %v", actionType, err)
@@ -647,8 +483,7 @@ func (c *Controller) ListPigTransferLogs(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "获取猪只迁移日志失败: "+err.Error(), actionType, "服务层查询失败", req)
 	}

-	resp := dto.NewListPigTransferLogResponse(data, total, req.Page, req.PageSize)
-	c.logger.Infof("%s: 成功, 获取到 %d 条记录, 总计 %d 条", actionType, len(data), total)
+	c.logger.Infof("%s: 成功, 获取到 %d 条记录, 总计 %d 条", actionType, len(resp.List), resp.Pagination.Total)
 	return controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "获取猪只迁移日志成功", resp, actionType, "获取猪只迁移日志成功", req)
 }

@@ -670,24 +505,7 @@ func (c *Controller) ListPigSickLogs(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的查询参数: "+err.Error(), actionType, "参数绑定失败", req)
 	}

-	opts := repository.PigSickLogListOptions{
-		PigBatchID: req.PigBatchID,
-		PenID:      req.PenID,
-		OperatorID: req.OperatorID,
-		OrderBy:    req.OrderBy,
-		StartTime:  req.StartTime,
-		EndTime:    req.EndTime,
-	}
-	if req.Reason != nil {
-		reason := models.PigBatchSickPigReasonType(*req.Reason)
-		opts.Reason = &reason
-	}
-	if req.TreatmentLocation != nil {
-		treatmentLocation := models.PigBatchSickPigTreatmentLocation(*req.TreatmentLocation)
-		opts.TreatmentLocation = &treatmentLocation
-	}
-
-	data, total, err := c.monitorService.ListPigSickLogs(opts, req.Page, req.PageSize)
+	resp, err := c.monitorService.ListPigSickLogs(&req)
 	if err != nil {
 		if errors.Is(err, repository.ErrInvalidPagination) {
 			c.logger.Warnf("%s: 无效的分页参数: %v", actionType, err)
@@ -698,8 +516,7 @@ func (c *Controller) ListPigSickLogs(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "获取病猪日志失败: "+err.Error(), actionType, "服务层查询失败", req)
 	}

-	resp := dto.NewListPigSickLogResponse(data, total, req.Page, req.PageSize)
-	c.logger.Infof("%s: 成功, 获取到 %d 条记录, 总计 %d 条", actionType, len(data), total)
+	c.logger.Infof("%s: 成功, 获取到 %d 条记录, 总计 %d 条", actionType, len(resp.List), resp.Pagination.Total)
 	return controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "获取病猪日志成功", resp, actionType, "获取病猪日志成功", req)
 }

@@ -721,16 +538,7 @@ func (c *Controller) ListPigPurchases(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的查询参数: "+err.Error(), actionType, "参数绑定失败", req)
 	}

-	opts := repository.PigPurchaseListOptions{
-		PigBatchID: req.PigBatchID,
-		Supplier:   req.Supplier,
-		OperatorID: req.OperatorID,
-		OrderBy:    req.OrderBy,
-		StartTime:  req.StartTime,
-		EndTime:    req.EndTime,
-	}
-
-	data, total, err := c.monitorService.ListPigPurchases(opts, req.Page, req.PageSize)
+	resp, err := c.monitorService.ListPigPurchases(&req)
 	if err != nil {
 		if errors.Is(err, repository.ErrInvalidPagination) {
 			c.logger.Warnf("%s: 无效的分页参数: %v", actionType, err)
@@ -741,8 +549,7 @@ func (c *Controller) ListPigPurchases(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "获取猪只采购记录失败: "+err.Error(), actionType, "服务层查询失败", req)
 	}

-	resp := dto.NewListPigPurchaseResponse(data, total, req.Page, req.PageSize)
-	c.logger.Infof("%s: 成功, 获取到 %d 条记录, 总计 %d 条", actionType, len(data), total)
+	c.logger.Infof("%s: 成功, 获取到 %d 条记录, 总计 %d 条", actionType, len(resp.List), resp.Pagination.Total)
 	return controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "获取猪只采购记录成功", resp, actionType, "获取猪只采购记录成功", req)
 }

@@ -764,16 +571,7 @@ func (c *Controller) ListPigSales(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的查询参数: "+err.Error(), actionType, "参数绑定失败", req)
 	}

-	opts := repository.PigSaleListOptions{
-		PigBatchID: req.PigBatchID,
-		Buyer:      req.Buyer,
-		OperatorID: req.OperatorID,
-		OrderBy:    req.OrderBy,
-		StartTime:  req.StartTime,
-		EndTime:    req.EndTime,
-	}
-
-	data, total, err := c.monitorService.ListPigSales(opts, req.Page, req.PageSize)
+	resp, err := c.monitorService.ListPigSales(&req)
 	if err != nil {
 		if errors.Is(err, repository.ErrInvalidPagination) {
 			c.logger.Warnf("%s: 无效的分页参数: %v", actionType, err)
@@ -784,8 +582,7 @@ func (c *Controller) ListPigSales(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "获取猪只售卖记录失败: "+err.Error(), actionType, "服务层查询失败", req)
 	}

-	resp := dto.NewListPigSaleResponse(data, total, req.Page, req.PageSize)
-	c.logger.Infof("%s: 成功, 获取到 %d 条记录, 总计 %d 条", actionType, len(data), total)
+	c.logger.Infof("%s: 成功, 获取到 %d 条记录, 总计 %d 条", actionType, len(resp.List), resp.Pagination.Total)
 	return controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "获取猪只售卖记录成功", resp, actionType, "获取猪只售卖记录成功", req)
 }

@@ -807,17 +604,7 @@ func (c *Controller) ListNotifications(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的查询参数: "+err.Error(), actionType, "参数绑定失败", req)
 	}

-	opts := repository.NotificationListOptions{
-		UserID:       req.UserID,
-		NotifierType: req.NotifierType,
-		Level:        req.Level,
-		StartTime:    req.StartTime,
-		EndTime:      req.EndTime,
-		OrderBy:      req.OrderBy,
-		Status:       req.Status,
-	}
-
-	data, total, err := c.monitorService.ListNotifications(opts, req.Page, req.PageSize)
+	resp, err := c.monitorService.ListNotifications(&req)
 	if err != nil {
 		if errors.Is(err, repository.ErrInvalidPagination) {
 			c.logger.Warnf("%s: 无效的分页参数: %v", actionType, err)
@@ -828,7 +615,6 @@ func (c *Controller) ListNotifications(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "批量查询通知失败: "+err.Error(), actionType, "服务层查询失败", req)
 	}

-	resp := dto.NewListNotificationResponse(data, total, req.Page, req.PageSize)
-	c.logger.Infof("%s: 成功, 获取到 %d 条记录, 总计 %d 条", actionType, len(data), total)
+	c.logger.Infof("%s: 成功, 获取到 %d 条记录, 总计 %d 条", actionType, len(resp.List), resp.Pagination.Total)
 	return controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "批量查询通知成功", resp, actionType, "批量查询通知成功", req)
 }