From dd75b36c03049be232a94d97eff1c4a5cc751fb5 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 31 十月 2023 22:08:39 +0800
Subject: [PATCH] 支持设备ID切换
---
api/v1/task.go | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index cd04286..d700a97 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
@@ -434,6 +433,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 +469,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