pkg/service/taskbench/taskBench.go

@@ -1,21 +1,19 @@
 package taskbench
 
 import (
-    "context"
+	"context"
-    "encoding/json"
+	"errors"
-    "errors"
+	"fmt"
-    "fmt"
+	"fonchain-fiee/api/accountFiee"
-    "fonchain-fiee/api/accountFiee"
+	"fonchain-fiee/api/bundle"
-    "fonchain-fiee/api/bundle"
+	"fonchain-fiee/api/cast"
-    "fonchain-fiee/api/cast"
+	"fonchain-fiee/cmd/config"
-    "fonchain-fiee/cmd/config"
+	modelCast "fonchain-fiee/pkg/model/cast"
-    modelCast "fonchain-fiee/pkg/model/cast"
+	"fonchain-fiee/pkg/model/login"
-    "fonchain-fiee/pkg/model/login"
+	"fonchain-fiee/pkg/service"
-    "fonchain-fiee/pkg/service"
+	castService "fonchain-fiee/pkg/service/cast"
-    castService "fonchain-fiee/pkg/service/cast"
+	"fonchain-fiee/pkg/utils"
-    "fonchain-fiee/pkg/utils"
+	"strconv"
-    "io"
-    "strconv"
 
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
@@ -40,25 +38,35 @@ func GetPendingTaskList(c *gin.Context) {
 }
 
 func GetPendingTaskLayout(c *gin.Context) {
-    res, err := service.BundleProvider.GetPendingTaskLayout(context.Background(), &bundle.GetPendingTaskLayoutReq{})
+	var req bundle.GetPendingTaskLayoutReq
-    if err != nil {
+	if err := c.ShouldBindJSON(&req); err != nil {
-        service.Error(c, err)
+		service.Error(c, err)
-        return
+		return
-    }
+	}
-    var j any
+
-    _ = json.Unmarshal([]byte(res.Data), &j)
+	res, err := service.BundleProvider.GetPendingTaskLayout(context.Background(), &req)
-    service.Success(c, j)
+	if err != nil {
+		service.Error(c, err)
+		return
+	}
+
+	service.Success(c, res)
 }
 
 func SetPendingTaskLayout(c *gin.Context) {
-    b, _ := io.ReadAll(c.Request.Body)
+	var req bundle.SetPendingTaskLayoutReq
-    var req = bundle.SetPendingTaskLayoutReq{Data: string(b)}
+	if err := c.ShouldBindJSON(&req); err != nil {
-    res, err := service.BundleProvider.SetPendingTaskLayout(context.Background(), &req)
+		service.Error(c, err)
-    if err != nil {
+		return
-        service.Error(c, err)
+	}
-        return
+
-    }
+	res, err := service.BundleProvider.SetPendingTaskLayout(context.Background(), &req)
-    service.Success(c, res)
+	if err != nil {
+		service.Error(c, err)
+		return
+	}
+
+	service.Success(c, res)
 }
 
 // AssignTask 指派某位员工完成某个艺人的任务