From 0457f96716de8125560f332fcf718100b9f754eb Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 13 九月 2023 21:03:56 +0800
Subject: [PATCH] 适应性改动
---
service/task.go | 45 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/service/task.go b/service/task.go
index 16bfd92..372c164 100644
--- a/service/task.go
+++ b/service/task.go
@@ -24,7 +24,10 @@
}
// GetTask 鑾峰彇浠诲姟锛屾湭瀹屾垚鐨勫紑濮嬫椂闂存渶鏃╃殑浠诲姟
-func (slf TaskService) GetTask(page, pageSize int) (taskDataList []*response.TaskData, count int64, code int) {
+func (slf TaskService) GetTask(page, pageSize int) (taskResp *response.TaskResponse, code int) {
+ var taskList []*response.TaskData
+ var count int64
+ var workers []*common.ProcedureWorker
nowTs := time.Now().Unix()
var (
err error
@@ -39,17 +42,17 @@
SetPage(page, pageSize).
FindNotTotal()
if err != nil {
- return nil, 0, ecode.DBErr
+ return nil, ecode.DBErr
}
count, err = model.NewProceduresSearch(nil).
SetDeviceId(conf.Conf.System.DeviceId).
SetStatusNot(model.ProcedureStatusFinished).
Count()
if err != nil {
- return nil, 0, ecode.DBErr
+ return nil, ecode.DBErr
}
if len(procedures) == 0 {
- return nil, 0, ecode.OK
+ return nil, ecode.OK
}
for _, procedure := range procedures {
@@ -57,7 +60,7 @@
}
orders, err = model.NewOrderSearch(nil).SetWorkOrderIds(workOrderIds).FindNotTotal() //鐢卞伐搴忓弽鎺ㄥ伐鍗�
if err != nil {
- return nil, 0, ecode.DBErr
+ return nil, ecode.DBErr
}
orderMap := make(map[string]*model.Order, len(workOrderIds))
@@ -68,13 +71,39 @@
taskData := response.TaskData{
Order: orderMap[procedure.WorkOrderID],
Procedure: procedure,
- AllProcedures: nil,
+ AllProcedures: procedure.ProceduresInfo.AllProcedureNames,
CurrentProcedureIndex: 0,
Position: procedure.Position,
}
- 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) {
--
Gitblit v1.8.0