From 24991928e6b6123751c05f166678883a89e4bf0a Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 03 十一月 2023 16:19:41 +0800
Subject: [PATCH] fix

---
 api/v1/task.go |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/api/v1/task.go b/api/v1/task.go
index cd04286..0b1c769 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -63,8 +63,7 @@
 		ctx.FailWithMsg(ecode.NeedConfirmedErr, err.Error())
 		return
 	}
-
-	taskCount := service.NewTaskService().NewTaskCount()
+	taskCount := service.NewTaskService().NewTaskCount(conf.Conf.CurrentDeviceID)
 	params.Page = 1
 	if params.PageSize <= 0 {
 		if params.TaskMode == constvar.TaskModeUnStarted {
@@ -79,7 +78,7 @@
 		taskMode = params.TaskMode
 	}
 
-	taskResponse, code := service.NewTaskService().GetTask(params.Page, params.PageSize, taskMode, nil) //鍙栬繘琛屼腑鐨勬垨鏈紑濮嬬殑
+	taskResponse, code := service.NewTaskService().GetTask(params.DeviceID, params.Page, params.PageSize, taskMode, nil) //鍙栬繘琛屼腑鐨勬垨鏈紑濮嬬殑
 	if code != ecode.OK {
 		ctx.Fail(code)
 		return
@@ -94,7 +93,7 @@
 			if existsChannel[int32(i)] {
 				continue
 			}
-			taskResponseTemp, code := service.NewTaskService().GetTask(params.Page, 1, constvar.TaskModeLastFinished, []int32{int32(i)}) //鍙栦笂涓�涓畬鎴愮殑
+			taskResponseTemp, code := service.NewTaskService().GetTask(params.DeviceID, params.Page, 1, constvar.TaskModeLastFinished, []int32{int32(i)}) //鍙栦笂涓�涓畬鎴愮殑
 			if code != ecode.OK {
 				ctx.Fail(code)
 				return
@@ -236,7 +235,7 @@
 	}
 
 	service.TaskFlagUnset(procedure.Channel)
-
+	service.TaskEndTimeSet(procedure.Channel, time.Now().Unix()) //璁剧疆宸ュ簭杩愯缁撴潫鏃堕棿
 	ctx.Ok()
 }
 
@@ -323,7 +322,9 @@
 		return
 	}
 
-	service.TaskFlagSet(procedure.Channel)
+	service.TaskFlagSet(procedure.Channel, int(procedure.ID))
+	service.TaskStartTimeSet(procedure.Channel, time.Now().Unix()) //璁剧疆宸ュ簭杩愯寮�濮嬫椂闂�
+	service.TaskEndTimeSet(procedure.Channel, 0)                   //璁剧疆宸ュ簭杩愯缁撴潫鏃堕棿
 	ctx.Ok()
 }
 
@@ -419,9 +420,9 @@
 // @Tags      Task
 // @Summary   鑾峰彇浠诲姟鍒楄〃2
 // @Produce   application/json
-// @Param     object  query    request.SimpleTaskList true  "鏌ヨ鍙傛暟"
-// @Success   200   {object}  contextx.Response{data=map[int32]response.taskResponse}  "鎴愬姛"
-// @Router    /v1/task/listByChannel [get]
+// @Param     object  query    request.TaskListByChannel true  "鏌ヨ鍙傛暟"
+// @Success   200   {object}  contextx.Response{data=map[int32]response.TaskResponse}  "鎴愬姛"
+// @Router    /v1/task/list [get]
 func (slf *TaskApi) TaskListByChannel(c *gin.Context) {
 	var params request.TaskListByChannel
 	ctx, ok := contextx.NewContext(c, &params)
@@ -434,6 +435,7 @@
 		ctx.FailWithMsg(ecode.NeedConfirmedErr, err.Error())
 		return
 	}
+	params.DeviceID = conf.Conf.CurrentDeviceID
 
 	dataMap := make(map[int32]*response.TaskResponse, channelAmount)
 	if params.Channel != nil {
@@ -469,7 +471,7 @@
 }
 
 func getTaskResponseByChannel(params request.TaskListByChannel, channel int32) (taskResponse *response.TaskResponse, err error) {
-	taskResponse, err = service.NewTaskService().GetTask2(params.Offset, params.Limit, []int32{channel}, params.Type) //鍙栬繘琛屼腑鐨勬垨鏈紑濮嬬殑
+	taskResponse, err = service.NewTaskService().GetTask2(params.DeviceID, params.Offset, params.Limit, []int32{channel}, params.Type) //鍙栬繘琛屼腑鐨勬垨鏈紑濮嬬殑
 	if err != nil {
 		return
 	}

--
Gitblit v1.8.0