From ef7d02ce56e98e8cbc5ed6ec746ea39bf0b8c9e2 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 16 九月 2023 22:44:58 +0800
Subject: [PATCH] 增加实时获取生产进度接口
---
service/task.go | 124 +++++++++++++++++++++++++++++------------
1 files changed, 88 insertions(+), 36 deletions(-)
diff --git a/service/task.go b/service/task.go
index 357de7b..64a72df 100644
--- a/service/task.go
+++ b/service/task.go
@@ -24,47 +24,86 @@
}
// GetTask 鑾峰彇浠诲姟锛屾湭瀹屾垚鐨勫紑濮嬫椂闂存渶鏃╃殑浠诲姟
-func (slf TaskService) GetTask() (taskData *response.TaskData, 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()
- orderSearch := model.NewOrderSearch(nil)
- orderSearch.SetOrder("start_time asc").
- SetStartTimeMax(nowTs).
- SetStatusList([]model.OrderStatus{model.OrderStatusWaitProcess, model.OrderStatusProcessing})
var (
- err error
- order *model.Order
+ err error
+ orders []*model.Order
+ procedures []*model.Procedures
+ workOrderIds []string
)
- order, err = orderSearch.First() //鍏堝彇杩涜涓殑浠诲姟
- if err == gorm.ErrRecordNotFound {
- err = nil
- return nil, ecode.OK
- }
- if err != nil {
- return nil, ecode.DBErr
- }
- procedure, err := model.NewProceduresSearch(nil).SetOrder("start_time asc").
- SetWorkOrderId(order.WorkOrderID).
+ procedures, err = model.NewProceduresSearch(nil).SetOrder("start_time asc").
SetStartTimeMax(nowTs).
SetDeviceId(conf.Conf.System.DeviceId).
SetStatusNot(model.ProcedureStatusFinished).
- First()
- if err == gorm.ErrRecordNotFound { //璇ヨ鍗曟湰璁惧鍏ㄩ儴宸ュ簭瀹屾垚锛屾妸璁㈠崟缃负瀹屾垚鐘舵�侊紙鍙槸瀵规湰璁惧瀹屾垚锛�
- err = nil
- err = model.NewOrderSearch(nil).SetWorkOrderId(order.WorkOrderID).UpdateByMap(map[string]interface{}{
- "status": model.OrderStatusFinished,
- })
- if err != nil {
- return nil, ecode.DBErr
- }
- return slf.GetTask() //褰撳墠璁㈠崟宸插畬鎴愶紝缁х画鏌ヨ鏈畬鎴愯鍗�
- }
+ SetPage(page, pageSize).
+ FindNotTotal()
if err != nil {
return nil, ecode.DBErr
}
- taskData = new(response.TaskData)
- taskData.Order = order
- taskData.Procedure = procedure
- return taskData, ecode.OK
+ count, err = model.NewProceduresSearch(nil).
+ SetDeviceId(conf.Conf.System.DeviceId).
+ SetStatusNot(model.ProcedureStatusFinished).
+ Count()
+ if err != nil {
+ return nil, ecode.DBErr
+ }
+ if len(procedures) == 0 {
+ return nil, ecode.OK
+ }
+
+ for _, procedure := range procedures {
+ workOrderIds = append(workOrderIds, procedure.WorkOrderID)
+ }
+ orders, err = model.NewOrderSearch(nil).SetWorkOrderIds(workOrderIds).FindNotTotal() //鐢卞伐搴忓弽鎺ㄥ伐鍗�
+ if err != nil {
+ return nil, ecode.DBErr
+ }
+
+ orderMap := make(map[string]*model.Order, len(workOrderIds))
+ for _, order := range orders {
+ orderMap[order.WorkOrderID] = order
+ }
+ for _, procedure := range procedures {
+ taskData := response.TaskData{
+ Order: orderMap[procedure.WorkOrderID],
+ Procedure: procedure,
+ AllProcedures: procedure.ProceduresInfo.AllProcedureNames,
+ CurrentProcedureIndex: 0,
+ Position: procedure.Position,
+ }
+ 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...)
+ }
+ 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) {
@@ -75,7 +114,20 @@
return procedure, ecode.OK
}
-func (slf TaskService) UpdateProcedureStatus(db *gorm.DB, id int, status model.ProcedureStatus) error {
+func (slf TaskService) UpdateProcedureStatusAndPosition(db *gorm.DB, id int, status model.ProcedureStatus, position int) error {
+ if status == model.ProcedureStatusFinished {
+ ProgressCacheUnset(position)
+ }
+ return model.NewProceduresSearch(db).SetId(id).UpdateByMap(map[string]interface{}{
+ "status": status,
+ "position": position,
+ })
+}
+
+func (slf TaskService) UpdateProcedureStatus(db *gorm.DB, id int, status model.ProcedureStatus, position int) error {
+ if status == model.ProcedureStatusFinished {
+ ProgressCacheUnset(position)
+ }
return model.NewProceduresSearch(db).SetId(id).UpdateByMap(map[string]interface{}{
"status": status,
})
@@ -138,11 +190,11 @@
return
}
-// GetCurrentTask 鑾峰彇寰呭畬鎴愭垨杩涜涓殑浠诲姟锛� 姣忎釜宸ュ崟鍙湁涓�涓伐搴�
-func (slf TaskService) GetCurrentTask() (workOrder *model.Order, err error) {
+// GetNextTask 鑾峰彇鏈紑濮嬬殑浠诲姟
+func (slf TaskService) GetNextTask() (workOrder *model.Order, err error) {
nowTs := time.Now().Unix()
orderSearch := model.NewOrderSearch(nil)
return orderSearch.SetOrder("start_time asc").
SetStartTimeMin(nowTs).
- SetStatusList([]model.OrderStatus{model.OrderStatusWaitProcess, model.OrderStatusProcessing}).First()
+ SetStatus(model.OrderStatusWaitProcess).First()
}
--
Gitblit v1.8.0