From 4db8b372c61025a80af529a47872a6fec6daf854 Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期三, 27 九月 2023 10:21:30 +0800 Subject: [PATCH] 删除获取未开始任务接口,统一用获取任务接口 --- service/task.go | 16 ++++------------ 1 files changed, 4 insertions(+), 12 deletions(-) diff --git a/service/task.go b/service/task.go index 40eb45f..d27ee1a 100644 --- a/service/task.go +++ b/service/task.go @@ -23,16 +23,8 @@ return &TaskService{} } -type TaskMode int - -const ( - TaskModeUnStarted TaskMode = 1 //鏈紑濮嬬殑 - TaskModeCurrent TaskMode = 2 - TaskModeLastFinished TaskMode = 3 //涓婁竴涓粨鏉熺殑 -) - // GetTask 鑾峰彇浠诲姟锛屾湭瀹屾垚鐨勫紑濮嬫椂闂村皬浜庣瓑浜庡綋鍓嶆椂闂达紝缁撴潫鏃堕棿澶т簬褰撳墠鏃堕棿鐨勪换鍔� -func (slf TaskService) GetTask(page, pageSize int, mode TaskMode, channels []int32) (taskResp *response.TaskResponse, code int) { +func (slf TaskService) GetTask(page, pageSize int, mode constvar.TaskMode, channels []int32) (taskResp *response.TaskResponse, code int) { var taskList []*response.TaskData var count int64 var workers []*common.ProcedureWorker @@ -54,17 +46,17 @@ SetDeviceId(conf.Conf.System.DeviceId). SetPage(page, pageSize) - if mode == TaskModeUnStarted { + if mode == constvar.TaskModeUnStarted { search.SetStatus(model.ProcedureStatusWaitProcess). SetStartTimeMax(nowTs). SetEndTimeMin(nowTs). SetOrder("start_time asc") - } else if mode == TaskModeCurrent { + } else if mode == constvar.TaskModeCurrent { search.SetStatusNot(model.ProcedureStatusFinished). SetStartTimeMax(nowTs). SetEndTimeMin(nowTs). SetOrder("status desc, start_time asc") - } else if mode == TaskModeLastFinished { + } else if mode == constvar.TaskModeLastFinished { search.SetStatus(model.ProcedureStatusFinished).SetOrder("updated_at desc") if len(channels) > 0 { search.SetChannels(channels) -- Gitblit v1.8.0