From b555874608be2e4bb40cceba60b497c04caef842 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 12 九月 2023 14:17:51 +0800
Subject: [PATCH] 三菱协议更改
---
service/task.go | 58 ++++++++++++++++++++++++++++------------------------------
1 files changed, 28 insertions(+), 30 deletions(-)
diff --git a/service/task.go b/service/task.go
index 43d6819..4def207 100644
--- a/service/task.go
+++ b/service/task.go
@@ -25,16 +25,26 @@
// GetTask 鑾峰彇浠诲姟锛屾湭瀹屾垚鐨勫紑濮嬫椂闂存渶鏃╃殑浠诲姟
func (slf TaskService) GetTask() (taskData *response.TaskData, code int) {
+ if v, ok := TaskCacheGet(); ok {
+ return v, ecode.OK
+ }
+
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
+ order *model.Order
+ procedure *model.Procedures
)
- order, err = orderSearch.First() //鍏堝彇杩涜涓殑浠诲姟
+ procedure, err = model.NewProceduresSearch(nil).SetOrder("start_time asc").
+ SetStartTimeMax(nowTs).
+ SetDeviceId(conf.Conf.System.DeviceId).
+ SetStatusNot(model.ProcedureStatusFinished).
+ First()
+ if err == gorm.ErrRecordNotFound {
+ return nil, ecode.OK
+ }
+
+ order, err = model.NewOrderSearch(nil).SetWorkOrderId(procedure.WorkOrderID).First() //鐢卞伐搴忓弽鎺ㄥ伐鍗�
if err == gorm.ErrRecordNotFound {
err = nil
return nil, ecode.OK
@@ -42,28 +52,10 @@
if err != nil {
return nil, ecode.DBErr
}
- procedure, err := model.NewProceduresSearch(nil).SetOrder("start_time asc").
- SetWorkOrderId(order.WorkOrderID).
- 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() //褰撳墠璁㈠崟宸插畬鎴愶紝缁х画鏌ヨ鏈畬鎴愯鍗�
- }
- if err != nil {
- return nil, ecode.DBErr
- }
taskData = new(response.TaskData)
taskData.Order = order
taskData.Procedure = procedure
+ TaskCacheSet(taskData)
return taskData, ecode.OK
}
@@ -76,6 +68,10 @@
}
func (slf TaskService) UpdateProcedureStatus(db *gorm.DB, id int, status model.ProcedureStatus) error {
+ if status == model.ProcedureStatusFinished {
+ TaskCacheUnset()
+ ProgressCacheUnset()
+ }
return model.NewProceduresSearch(db).SetId(id).UpdateByMap(map[string]interface{}{
"status": status,
})
@@ -120,7 +116,9 @@
OrderId: procedure.OrderID,
Product: order.ProductName,
Procedure: procedure.ProceduresInfo.ProcedureName,
- Device: procedure.ProceduresInfo.DeviceName}, &result, time.Second*3)
+ Device: procedure.ProceduresInfo.DeviceName,
+ DeviceId: conf.Conf.System.DeviceId,
+ }, &result, time.Second*3)
if err != nil {
logx.Errorf("TaskStart GetProcessModel error:%v", err.Error())
return
@@ -136,11 +134,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