From 468ceb8a9bfe9e15e3be470b23809dde83a11f0d Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 09 十月 2023 19:14:53 +0800
Subject: [PATCH] merge master
---
service/task.go | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/service/task.go b/service/task.go
index 94df214..4ff5cb8 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
}
@@ -137,14 +131,19 @@
return procedure, ecode.OK
}
-func (slf TaskService) UpdateProcedureStatusAndChannel(db *gorm.DB, id uint, status model.ProcedureStatus, channel int32) error {
- if status == model.ProcedureStatusFinished {
+func (slf TaskService) UpdateProcedureStatusAndChannel(db *gorm.DB, id int, status model.ProcedureStatus, channel int32, processModelNumber string) error {
+ if status == model.ProcedureStatusFinished || status == model.ProcedureStatusWaitProcess {
ProgressCacheUnset(channel)
}
- return model.NewProceduresSearch(db).SetId(id).UpdateByMap(map[string]interface{}{
- "status": status,
- "channel": channel,
- })
+
+ upMap := map[string]interface{}{"status": status}
+ if status == model.ProcedureStatusProcessing {
+ upMap["process_model_number"] = processModelNumber
+ } else if status == model.ProcedureStatusWaitProcess {
+ upMap["process_model_number"] = ""
+ }
+
+ return model.NewProceduresSearch(db).SetId(id).UpdateByMap(upMap)
}
func (slf TaskService) UpdateProcedureStatus(db *gorm.DB, id uint, status model.ProcedureStatus, channel int32) error {
--
Gitblit v1.8.0