From 86511ae2c82d778812ea0cddc4efc08f0712dd07 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 27 九月 2023 16:41:30 +0800
Subject: [PATCH] fix
---
service/task.go | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/service/task.go b/service/task.go
index d24b996..446ae6d 100644
--- a/service/task.go
+++ b/service/task.go
@@ -106,15 +106,17 @@
taskList = append(taskList, &taskData)
workers = append(workers, procedure.ProceduresInfo.Workers...)
}
-
- count, _ = model.NewProceduresSearch(nil).SetDeviceId(conf.Conf.System.DeviceId).SetStatus(model.ProcedureStatusWaitProcess).SetStartTimeMax(nowTs).SetEndTimeMin(nowTs).Count()
taskResp = &response.TaskResponse{
- Tasks: taskList,
- TaskCount: count,
- Workers: slf.WorkerDistinct(workers),
+ Tasks: taskList,
+ Workers: slf.WorkerDistinct(workers),
}
return taskResp, ecode.OK
}
+func (slf TaskService) NewTaskCount() (count int64) {
+ nowTs := time.Now().Unix()
+ count, _ = model.NewProceduresSearch(nil).SetDeviceId(conf.Conf.System.DeviceId).SetStatus(model.ProcedureStatusWaitProcess).SetStartTimeMax(nowTs).SetEndTimeMin(nowTs).Count()
+ return count
+}
func (slf TaskService) WorkerDistinct(workers []*common.ProcedureWorker) (NoRepeatedWorkers []*common.ProcedureWorker) {
exists := make(map[string]bool, 0)
--
Gitblit v1.8.0