From 196437f8ba646344cf25c9fa4bd3797ca40e2154 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 13 九月 2023 15:40:54 +0800
Subject: [PATCH] 支持获取多个任务，增加任务数量统计

---
 api/v1/task.go |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/api/v1/task.go b/api/v1/task.go
index 7fb3b50..ae11df0 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -5,6 +5,7 @@
 	"apsClient/constvar"
 	"apsClient/model"
 	"apsClient/model/common"
+	"apsClient/model/request"
 	"apsClient/model/response"
 	"apsClient/nsq"
 	"apsClient/pkg/contextx"
@@ -48,20 +49,32 @@
 // @Tags      Task
 // @Summary   鑾峰彇浠诲姟
 // @Produce   application/json
+// @Param     object  query    request.TaskList true  "鏌ヨ鍙傛暟"
 // @Success   200   {object}  contextx.Response{data=response.TaskData}  "鎴愬姛"
 // @Router    /v1/task/get [get]
 func (slf *TaskApi) TaskGet(c *gin.Context) {
-	ctx, ok := contextx.NewContext(c, nil)
+	var params request.TaskList
+	ctx, ok := contextx.NewContext(c, &params)
 	if !ok {
 		return
 	}
+	if params.Page <= 0 {
+		params.Page = 1
+	}
+	if params.PageSize <= 0 {
+		params.PageSize = 1
+	}
 
-	taskData, code := service.NewTaskService().GetTask()
+	taskDataList, count, code := service.NewTaskService().GetTask(params.Page, params.PageSize)
 	if code != ecode.OK {
 		ctx.Fail(code)
 		return
 	}
-	ctx.OkWithDetailed(taskData)
+	taskResponse := &response.TaskResponse{
+		Tasks:     taskDataList,
+		TaskCount: count,
+	}
+	ctx.OkWithDetailed(taskResponse)
 }
 
 // GetProcessParams

--
Gitblit v1.8.0