From cf96f6bc1fb484fde16bd5ed6d49534c96958022 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 25 九月 2023 15:43:12 +0800
Subject: [PATCH] fix
---
api/v1/task.go | 49 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 36 insertions(+), 13 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index 2a15943..480a58f 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -19,6 +19,7 @@
"fmt"
"github.com/gin-gonic/gin"
"gorm.io/gorm"
+ "sort"
"time"
)
@@ -51,7 +52,7 @@
// @Summary 鑾峰彇浠诲姟
// @Produce application/json
// @Param object query request.TaskList true "鏌ヨ鍙傛暟"
-// @Success 200 {object} contextx.Response{data=response.TaskData} "鎴愬姛"
+// @Success 200 {object} contextx.Response{data=response.TaskResponse} "鎴愬姛"
// @Router /v1/task/get [get]
func (slf *TaskApi) TaskGet(c *gin.Context) {
var params request.TaskList
@@ -59,25 +60,46 @@
if !ok {
return
}
- if params.Page <= 0 {
- params.Page = 1
- }
- if params.PageSize <= 0 {
- params.PageSize = 1
+
+ channelAmount, err := service.NewDevicePlcService().GetDeviceChannelAmount()
+ if err != nil {
+ ctx.FailWithMsg(ecode.NeedConfirmedErr, err.Error())
+ return
}
- taskResponse, code := service.NewTaskService().GetTask(params.Page, params.PageSize, service.TaskModeCurrent) //鍙栬繘琛屼腑鐨勬垨鏈紑濮嬬殑
+ params.Page = 1
+
+ if params.PageSize <= 0 {
+ params.PageSize = channelAmount
+ }
+
+ taskResponse, code := service.NewTaskService().GetTask(params.Page, params.PageSize, service.TaskModeCurrent, nil) //鍙栬繘琛屼腑鐨勬垨鏈紑濮嬬殑
if code != ecode.OK {
ctx.Fail(code)
return
}
- if len(taskResponse.Tasks) == 0 {
- taskResponse, code = service.NewTaskService().GetTask(params.Page, params.PageSize, service.TaskModeLastFinished) //鍙栦笂涓�涓畬鎴愮殑
- if code != ecode.OK {
- ctx.Fail(code)
- return
+
+ if len(taskResponse.Tasks) < channelAmount {
+ var existsChannel = make(map[int32]bool, channelAmount)
+ for _, task := range taskResponse.Tasks {
+ existsChannel[task.Channel] = true
+ }
+ for i := 0; i < channelAmount; i++ {
+ if existsChannel[int32(i)] {
+ continue
+ }
+ taskResponseTemp, code := service.NewTaskService().GetTask(params.Page, 1, service.TaskModeLastFinished, []int32{int32(i)}) //鍙栦笂涓�涓畬鎴愮殑
+ if code != ecode.OK {
+ ctx.Fail(code)
+ return
+ }
+ taskResponse.Tasks = append(taskResponse.Tasks, taskResponseTemp.Tasks...)
}
}
+
+ sort.Slice(taskResponse.Tasks, func(i, j int) bool {
+ return taskResponse.Tasks[i].Channel < taskResponse.Tasks[i].Channel
+ })
for _, task := range taskResponse.Tasks {
if task.Procedure.Status == model.ProcedureStatusWaitProcess {
@@ -86,6 +108,7 @@
}
taskResponse.Prompt = conf.Conf.Prompt
+ taskResponse.ChannelAmount = channelAmount
ctx.OkWithDetailed(taskResponse)
}
@@ -110,7 +133,7 @@
params.PageSize = 100
}
- taskResponse, code := service.NewTaskService().GetTask(params.Page, params.PageSize, service.TaskModeUnStarted) //鏃堕棿鍒颁簡鏈紑濮嬬殑
+ taskResponse, code := service.NewTaskService().GetTask(params.Page, params.PageSize, service.TaskModeUnStarted, nil) //鏃堕棿鍒颁簡鏈紑濮嬬殑
if code != ecode.OK {
ctx.Fail(code)
return
--
Gitblit v1.8.0