修复bug

internal/app/controller/plan/converter.go

@@ -1,15 +1,16 @@
 package plan
 
 import (
-	"git.huangwc.com/pig/pig-farm-controller/internal/app/controller"
+	"encoding/json"
+	"fmt"
+
 	"git.huangwc.com/pig/pig-farm-controller/internal/infra/models"
-	"gorm.io/datatypes"
 )
 
 // PlanToResponse 将Plan模型转换为PlanResponse
-func PlanToResponse(plan *models.Plan) *PlanResponse {
+func PlanToResponse(plan *models.Plan) (*PlanResponse, error) {
 	if plan == nil {
-		return nil
+		return nil, nil
 	}
 
 	response := &PlanResponse{
@@ -28,7 +29,11 @@ func PlanToResponse(plan *models.Plan) *PlanResponse {
 	if plan.ContentType == models.PlanContentTypeSubPlans {
 		response.SubPlans = make([]SubPlanResponse, len(plan.SubPlans))
 		for i, subPlan := range plan.SubPlans {
-			response.SubPlans[i] = SubPlanToResponse(&subPlan)
+			subPlanResp, err := SubPlanToResponse(&subPlan)
+			if err != nil {
+				return nil, err
+			}
+			response.SubPlans[i] = subPlanResp
 		}
 	}
 
@@ -36,11 +41,15 @@ func PlanToResponse(plan *models.Plan) *PlanResponse {
 	if plan.ContentType == models.PlanContentTypeTasks {
 		response.Tasks = make([]TaskResponse, len(plan.Tasks))
 		for i, task := range plan.Tasks {
-			response.Tasks[i] = TaskToResponse(&task)
+			taskResp, err := TaskToResponse(&task)
+			if err != nil {
+				return nil, err
+			}
+			response.Tasks[i] = taskResp
 		}
 	}
 
-	return response
+	return response, nil
 }
 
 // PlanFromCreateRequest 将CreatePlanRequest转换为Plan模型，并进行业务规则验证
@@ -73,8 +82,11 @@ func PlanFromCreateRequest(req *CreatePlanRequest) (*models.Plan, error) {
 	if req.ContentType == models.PlanContentTypeTasks && req.Tasks != nil {
 		plan.Tasks = make([]models.Task, len(req.Tasks))
 		for i, taskReq := range req.Tasks {
-			// 使用来自请求的ExecutionOrder
-			plan.Tasks[i] = TaskFromRequest(&taskReq)
+			task, err := TaskFromRequest(&taskReq)
+			if err != nil {
+				return nil, err
+			}
+			plan.Tasks[i] = task
 		}
 	}
 
@@ -120,8 +132,11 @@ func PlanFromUpdateRequest(req *UpdatePlanRequest) (*models.Plan, error) {
 	if req.ContentType == models.PlanContentTypeTasks && req.Tasks != nil {
 		plan.Tasks = make([]models.Task, len(req.Tasks))
 		for i, taskReq := range req.Tasks {
-			// 使用来自请求的ExecutionOrder
-			plan.Tasks[i] = TaskFromRequest(&taskReq)
+			task, err := TaskFromRequest(&taskReq)
+			if err != nil {
+				return nil, err
+			}
+			plan.Tasks[i] = task
 		}
 	}
 
@@ -138,9 +153,9 @@ func PlanFromUpdateRequest(req *UpdatePlanRequest) (*models.Plan, error) {
 }
 
 // SubPlanToResponse 将SubPlan模型转换为SubPlanResponse
-func SubPlanToResponse(subPlan *models.SubPlan) SubPlanResponse {
+func SubPlanToResponse(subPlan *models.SubPlan) (SubPlanResponse, error) {
 	if subPlan == nil {
-		return SubPlanResponse{}
+		return SubPlanResponse{}, nil
 	}
 
 	response := SubPlanResponse{
@@ -152,16 +167,27 @@ func SubPlanToResponse(subPlan *models.SubPlan) SubPlanResponse {
 
 	// 如果有完整的子计划数据，也进行转换
 	if subPlan.ChildPlan != nil {
-		response.ChildPlan = PlanToResponse(subPlan.ChildPlan)
+		childPlanResp, err := PlanToResponse(subPlan.ChildPlan)
+		if err != nil {
+			return SubPlanResponse{}, err
+		}
+		response.ChildPlan = childPlanResp
 	}
 
-	return response
+	return response, nil
 }
 
 // TaskToResponse 将Task模型转换为TaskResponse
-func TaskToResponse(task *models.Task) TaskResponse {
+func TaskToResponse(task *models.Task) (TaskResponse, error) {
 	if task == nil {
-		return TaskResponse{}
+		return TaskResponse{}, nil
+	}
+
+	var params map[string]interface{}
+	if len(task.Parameters) > 0 && string(task.Parameters) != "null" {
+		if err := json.Unmarshal(task.Parameters, &params); err != nil {
+			return TaskResponse{}, fmt.Errorf("parsing task parameters failed (ID: %d): %w", task.ID, err)
+		}
 	}
 
 	return TaskResponse{
@@ -171,14 +197,19 @@ func TaskToResponse(task *models.Task) TaskResponse {
 		Description:    task.Description,
 		ExecutionOrder: task.ExecutionOrder,
 		Type:           task.Type,
-		Parameters:     controller.Properties(task.Parameters),
-	}
+		Parameters:     params,
+	}, nil
 }
 
 // TaskFromRequest 将TaskRequest转换为Task模型
-func TaskFromRequest(req *TaskRequest) models.Task {
+func TaskFromRequest(req *TaskRequest) (models.Task, error) {
 	if req == nil {
-		return models.Task{}
+		return models.Task{}, nil
+	}
+
+	paramsJSON, err := json.Marshal(req.Parameters)
+	if err != nil {
+		return models.Task{}, fmt.Errorf("serializing task parameters failed: %w", err)
 	}
 
 	return models.Task{
@@ -186,6 +217,6 @@ func TaskFromRequest(req *TaskRequest) models.Task {
 		Description:    req.Description,
 		ExecutionOrder: req.ExecutionOrder,
 		Type:           req.Type,
-		Parameters:     datatypes.JSON(req.Parameters),
-	}
+		Parameters:     paramsJSON,
+	}, nil
 }