From 3a1d4cc4ddfe02942e5c8dee0b2187cf758f3bde Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 23 九月 2023 16:48:06 +0800
Subject: [PATCH] 按通道数量给前端返回任务数
---
api/v1/task.go | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index 2a15943..81547c1 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -59,13 +59,19 @@
if !ok {
return
}
+
+ channelAmount, err := service.NewDevicePlcService().GetDeviceChannelAmount()
+ if err != nil {
+ ctx.FailWithMsg(ecode.NeedConfirmedErr, err.Error())
+ return
+ }
+
if params.Page <= 0 {
params.Page = 1
}
- if params.PageSize <= 0 {
- params.PageSize = 1
- }
+ params.PageSize = channelAmount
+
taskResponse, code := service.NewTaskService().GetTask(params.Page, params.PageSize, service.TaskModeCurrent) //鍙栬繘琛屼腑鐨勬垨鏈紑濮嬬殑
if code != ecode.OK {
ctx.Fail(code)
--
Gitblit v1.8.0