From cf96f6bc1fb484fde16bd5ed6d49534c96958022 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 25 九月 2023 15:43:12 +0800
Subject: [PATCH] fix
---
service/task.go | 117 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 92 insertions(+), 25 deletions(-)
diff --git a/service/task.go b/service/task.go
index 96f2b4f..9b7eb16 100644
--- a/service/task.go
+++ b/service/task.go
@@ -23,8 +23,26 @@
return &TaskService{}
}
-// GetTask 鑾峰彇浠诲姟锛屾湭瀹屾垚鐨勫紑濮嬫椂闂存渶鏃╃殑浠诲姟
-func (slf TaskService) GetTask(page, pageSize int) (taskDataList []*response.TaskData, count int64, code int) {
+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) {
+ 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
@@ -32,24 +50,37 @@
procedures []*model.Procedures
workOrderIds []string
)
- procedures, err = model.NewProceduresSearch(nil).SetOrder("start_time asc").
- SetStartTimeMax(nowTs).
+ search := model.NewProceduresSearch(nil).
SetDeviceId(conf.Conf.System.DeviceId).
- SetStatusNot(model.ProcedureStatusFinished).
- SetPage(page, pageSize).
- FindNotTotal()
- if err != nil {
- return nil, 0, ecode.DBErr
+ SetPage(page, pageSize)
+
+ if mode == TaskModeUnStarted {
+ search.SetStatus(model.ProcedureStatusWaitProcess).
+ SetStartTimeMax(nowTs).
+ SetEndTimeMin(nowTs).
+ SetOrder("start_time asc")
+ } else if mode == TaskModeCurrent {
+ search.SetStatusNot(model.ProcedureStatusFinished).
+ SetStartTimeMax(nowTs).
+ SetEndTimeMin(nowTs).
+ 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)
+ }
}
- count, err = model.NewProceduresSearch(nil).
- SetDeviceId(conf.Conf.System.DeviceId).
- SetStatusNot(model.ProcedureStatusFinished).
- Count()
+
+ procedures, err = search.FindNotTotal()
if err != nil {
- return nil, 0, ecode.DBErr
+ return taskResp, ecode.DBErr
+ }
+ count, err = search.Count()
+ if err != nil {
+ return taskResp, ecode.DBErr
}
if len(procedures) == 0 {
- return nil, 0, ecode.OK
+ return taskResp, ecode.OK
}
for _, procedure := range procedures {
@@ -57,7 +88,7 @@
}
orders, err = model.NewOrderSearch(nil).SetWorkOrderIds(workOrderIds).FindNotTotal() //鐢卞伐搴忓弽鎺ㄥ伐鍗�
if err != nil {
- return nil, 0, ecode.DBErr
+ return taskResp, ecode.DBErr
}
orderMap := make(map[string]*model.Order, len(workOrderIds))
@@ -66,12 +97,41 @@
}
for _, procedure := range procedures {
taskData := response.TaskData{
- Order: orderMap[procedure.WorkOrderID],
- Procedure: procedure,
+ Order: orderMap[procedure.WorkOrderID],
+ Procedure: procedure,
+ AllProcedures: procedure.ProceduresInfo.AllProcedureNames,
+ CurrentProcedureIndex: 0,
+ Channel: procedure.Channel,
}
- taskDataList = append(taskDataList, &taskData)
+ index := 0
+ for _, name := range procedure.ProceduresInfo.AllProcedureNames {
+ if name == procedure.ProceduresInfo.ProcedureName {
+ break
+ }
+ index++
+ }
+ taskData.CurrentProcedureIndex = index
+ taskList = append(taskList, &taskData)
+ workers = append(workers, procedure.ProceduresInfo.Workers...)
}
- return taskDataList, count, ecode.OK
+ taskResp = &response.TaskResponse{
+ Tasks: taskList,
+ TaskCount: count,
+ Workers: slf.WorkerDistinct(workers),
+ }
+ return taskResp, ecode.OK
+}
+
+func (slf TaskService) WorkerDistinct(workers []*common.ProcedureWorker) (NoRepeatedWorkers []*common.ProcedureWorker) {
+ exists := make(map[string]bool, 0)
+ for _, worker := range workers {
+ key := fmt.Sprintf("%v%v", worker.WorkerID, worker.StartTime)
+ if !exists[key] {
+ NoRepeatedWorkers = append(NoRepeatedWorkers, worker)
+ exists[key] = true
+ }
+ }
+ return NoRepeatedWorkers
}
func (slf TaskService) GetProcedureById(id int) (*model.Procedures, int) {
@@ -82,9 +142,19 @@
return procedure, ecode.OK
}
-func (slf TaskService) UpdateProcedureStatus(db *gorm.DB, id int, status model.ProcedureStatus) error {
+func (slf TaskService) UpdateProcedureStatusAndChannel(db *gorm.DB, id int, status model.ProcedureStatus, channel int32) error {
if status == model.ProcedureStatusFinished {
- ProgressCacheUnset()
+ ProgressCacheUnset(channel)
+ }
+ return model.NewProceduresSearch(db).SetId(id).UpdateByMap(map[string]interface{}{
+ "status": status,
+ "channel": channel,
+ })
+}
+
+func (slf TaskService) UpdateProcedureStatus(db *gorm.DB, id int, status model.ProcedureStatus, channel int32) error {
+ if status == model.ProcedureStatusFinished {
+ ProgressCacheUnset(channel)
}
return model.NewProceduresSearch(db).SetId(id).UpdateByMap(map[string]interface{}{
"status": status,
@@ -103,9 +173,6 @@
func (slf TaskService) GetProcessParams(procedure *model.Procedures, order *model.Order) (processModel *model.ProcessModel, err error) {
data, err := model.NewProcessModelSearch().
- SetWorkOrder(procedure.WorkOrderID).
- SetDevice(procedure.ProceduresInfo.DeviceName).
- SetOrderId(procedure.OrderID).
SetProcedure(procedure.ProceduresInfo.ProcedureName).
SetProduct(order.ProductName).
SetOrder("id desc").First()
--
Gitblit v1.8.0