From d4243f398b84a8b8cdcd27c35ace72f6a30a6452 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期日, 08 十月 2023 10:45:09 +0800
Subject: [PATCH] 是否可以开始增加开始时间判断，考虑进程退出和断电情况
---
service/task.go | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/service/task.go b/service/task.go
index e20f5c5..f9413cc 100644
--- a/service/task.go
+++ b/service/task.go
@@ -34,7 +34,6 @@
Workers: slf.WorkerDistinct(workers),
}
- nowTs := time.Now().Unix()
var (
err error
orders []*model.Order
@@ -47,14 +46,10 @@
if mode == constvar.TaskModeUnStarted {
search.SetStatus(model.ProcedureStatusWaitProcess).
- SetStartTimeMax(nowTs).
- SetEndTimeMin(nowTs).
SetOrder("start_time asc")
} else if mode == constvar.TaskModeCurrent {
search.SetStatus(model.ProcedureStatusProcessing).
- SetStartTimeMax(nowTs).
- SetEndTimeMin(nowTs).
- SetOrder("status desc, start_time asc")
+ SetOrder("start_time asc")
} else if mode == constvar.TaskModeLastFinished {
search.SetStatus(model.ProcedureStatusFinished).SetOrder("updated_at desc")
if len(channels) > 0 {
@@ -112,8 +107,7 @@
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).SetEndTimeMin(nowTs).Count()
+ count, _ = model.NewProceduresSearch(nil).SetDeviceId(conf.Conf.System.DeviceId).SetStatus(model.ProcedureStatusWaitProcess).Count()
return count
}
--
Gitblit v1.8.0