From 94a760e098571a4657c93985a89ec084f8df357c Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 25 九月 2023 14:02:43 +0800
Subject: [PATCH] 当返回的任务数不足通道数时，按通道号查询已完成的，补齐
---
service/task.go | 22 ++++++++---
model/procedures.go | 10 +++++
api/v1/task.go | 34 ++++++++++++-----
3 files changed, 50 insertions(+), 16 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index a0c394d..e93f396 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"
)
@@ -66,26 +67,39 @@
return
}
- if params.Page <= 0 {
- params.Page = 1
- }
+ params.Page = 1
if params.Page <= 0 {
params.PageSize = channelAmount
}
- taskResponse, code := service.NewTaskService().GetTask(params.Page, params.PageSize, service.TaskModeCurrent) //鍙栬繘琛屼腑鐨勬垨鏈紑濮嬬殑
+ 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 {
@@ -119,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
diff --git a/model/procedures.go b/model/procedures.go
index 8d893e6..cb8d660 100644
--- a/model/procedures.go
+++ b/model/procedures.go
@@ -36,6 +36,7 @@
EndTimeMin int64
StatusNot ProcedureStatus
ProcedureIds []string
+ Channels []int32
}
)
@@ -133,6 +134,11 @@
return slf
}
+func (slf *ProceduresSearch) SetChannels(channels []int32) *ProceduresSearch {
+ slf.Channels = channels
+ return slf
+}
+
func (slf *ProceduresSearch) build() *gorm.DB {
var db = slf.Orm.Model(&Procedures{})
@@ -180,6 +186,10 @@
db = db.Where("procedure_id = ?", slf.ProcedureID)
}
+ if len(slf.Channels) > 0 {
+ db = db.Where("channel in ?", slf.Channels)
+ }
+
return db
}
diff --git a/service/task.go b/service/task.go
index 30f5a3c..9b7eb16 100644
--- a/service/task.go
+++ b/service/task.go
@@ -32,10 +32,17 @@
)
// GetTask 鑾峰彇浠诲姟锛屾湭瀹屾垚鐨勫紑濮嬫椂闂村皬浜庣瓑浜庡綋鍓嶆椂闂达紝缁撴潫鏃堕棿澶т簬褰撳墠鏃堕棿鐨勪换鍔�
-func (slf TaskService) GetTask(page, pageSize int, mode TaskMode) (taskResp *response.TaskResponse, code int) {
+func (slf TaskService) GetTask(page, pageSize int, mode TaskMode, channels []int32) (taskResp *response.TaskResponse, code int) {
var taskList []*response.TaskData
var count int64
var workers []*common.ProcedureWorker
+
+ taskResp = &response.TaskResponse{
+ Tasks: taskList,
+ TaskCount: count,
+ Workers: slf.WorkerDistinct(workers),
+ }
+
nowTs := time.Now().Unix()
var (
err error
@@ -56,21 +63,24 @@
search.SetStatusNot(model.ProcedureStatusFinished).
SetStartTimeMax(nowTs).
SetEndTimeMin(nowTs).
- SetOrder("start_time asc, status desc")
+ SetOrder("status desc, start_time asc")
} else if mode == TaskModeLastFinished {
search.SetStatus(model.ProcedureStatusFinished).SetOrder("updated_at desc")
+ if len(channels) > 0 {
+ search.SetChannels(channels)
+ }
}
procedures, err = search.FindNotTotal()
if err != nil {
- return nil, ecode.DBErr
+ return taskResp, ecode.DBErr
}
count, err = search.Count()
if err != nil {
- return nil, ecode.DBErr
+ return taskResp, ecode.DBErr
}
if len(procedures) == 0 {
- return nil, ecode.OK
+ return taskResp, ecode.OK
}
for _, procedure := range procedures {
@@ -78,7 +88,7 @@
}
orders, err = model.NewOrderSearch(nil).SetWorkOrderIds(workOrderIds).FindNotTotal() //鐢卞伐搴忓弽鎺ㄥ伐鍗�
if err != nil {
- return nil, ecode.DBErr
+ return taskResp, ecode.DBErr
}
orderMap := make(map[string]*model.Order, len(workOrderIds))
--
Gitblit v1.8.0