From 8e99b8ff834caf55656a72450843cb2cf762dd0b Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 08 十一月 2023 14:37:47 +0800
Subject: [PATCH] fix
---
model/request/task.go | 1 -
api/v1/task.go | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index 553b76d..439a8d7 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -77,7 +77,7 @@
taskMode = params.TaskMode
}
- taskResponse, code := service.NewTaskService().GetTask(params.DeviceID, params.Page, params.PageSize, taskMode, nil) //鍙栬繘琛屼腑鐨勬垨鏈紑濮嬬殑
+ taskResponse, code := service.NewTaskService().GetTask(conf.Conf.CurrentDeviceID, params.Page, params.PageSize, taskMode, nil) //鍙栬繘琛屼腑鐨勬垨鏈紑濮嬬殑
if code != ecode.OK {
ctx.Fail(code)
return
@@ -92,7 +92,7 @@
if existsChannel[int32(i)] {
continue
}
- taskResponseTemp, code := service.NewTaskService().GetTask(params.DeviceID, params.Page, 1, constvar.TaskModeLastFinished, []int32{int32(i)}) //鍙栦笂涓�涓畬鎴愮殑
+ taskResponseTemp, code := service.NewTaskService().GetTask(conf.Conf.CurrentDeviceID, params.Page, 1, constvar.TaskModeLastFinished, []int32{int32(i)}) //鍙栦笂涓�涓畬鎴愮殑
if code != ecode.OK {
ctx.Fail(code)
return
diff --git a/model/request/task.go b/model/request/task.go
index 1a2c6b6..ff7489b 100644
--- a/model/request/task.go
+++ b/model/request/task.go
@@ -15,7 +15,6 @@
type TaskList struct {
PageInfo
TaskMode constvar.TaskMode `json:"taskMode" form:"taskMode"`
- DeviceID string `json:"deviceID"`
}
type SendProcessParams struct {
--
Gitblit v1.8.0