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 | 130 +++++++++++++++++++++++++++++++------------
1 files changed, 94 insertions(+), 36 deletions(-)
diff --git a/service/task.go b/service/task.go
index e173964..4def207 100644
--- a/service/task.go
+++ b/service/task.go
@@ -1,9 +1,17 @@
package service
import (
+ "apsClient/conf"
+ "apsClient/constvar"
"apsClient/model"
+ "apsClient/model/common"
"apsClient/model/response"
+ "apsClient/nsq"
"apsClient/pkg/ecode"
+ "apsClient/pkg/logx"
+ "apsClient/pkg/structx"
+ "encoding/json"
+ "fmt"
"gorm.io/gorm"
"time"
)
@@ -17,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("created_at asc").
- SetStartTimeMax(nowTs).
- SetStatus(model.OrderStatusUnFinished)
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
@@ -34,36 +52,10 @@
if err != nil {
return nil, ecode.DBErr
}
- procedure, err := model.NewProceduresSearch(nil).
- SetWorkOrderId(order.WorkOrderID).
- SetStartTimeMax(nowTs).
- SetStatus(model.ProcedureStatusUnFinished).
- 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
- }
- nextProcedure := new(model.Procedures)
- nextProcedure, err = model.NewProceduresSearch(nil).
- SetWorkOrderId(order.WorkOrderID).
- SetStatus(model.ProcedureStatusUnFinished).
- SetId(procedure.ID + 1).First()
- if err == nil {
- nextProcedure.ProceduresInfo.ProcedureName = "--"
- }
taskData = new(response.TaskData)
taskData.Order = order
taskData.Procedure = procedure
- taskData.NextProcedure = nextProcedure
+ TaskCacheSet(taskData)
return taskData, ecode.OK
}
@@ -75,8 +67,18 @@
return procedure, ecode.OK
}
-func (slf TaskService) UpdateProcedureStatus(id int, status model.ProcedureStatus) error {
- return model.NewProceduresSearch(nil).SetId(id).UpdateByMap(map[string]interface{}{
+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,
+ })
+}
+
+func (slf TaskService) UpdateOrderStatus(db *gorm.DB, id uint, status model.OrderStatus) error {
+ return model.NewOrderSearch(db).SetId(id).UpdateByMap(map[string]interface{}{
"status": status,
})
}
@@ -84,3 +86,59 @@
func (slf TaskService) GetOrderByWorkOrderId(workOrderId string) (order *model.Order, err error) {
return model.NewOrderSearch(nil).SetWorkOrderId(workOrderId).First()
}
+
+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()
+ if err != nil && err != gorm.ErrRecordNotFound {
+ logx.Errorf("TaskStart GetProcessModel err:%v", err)
+ return nil, err
+ }
+ if err == nil {
+ err = json.Unmarshal([]byte(data.Params), &data.ParamsMap)
+ if err != nil {
+ logx.Errorf("process model json.Unmarshal:%v", err)
+ return
+ }
+ return data, nil
+ }
+
+ if err == gorm.ErrRecordNotFound { //濡傛灉鏁版嵁搴撴病鏈変粠浜戠鑾峰彇
+ caller := nsq.NewCaller(fmt.Sprintf(constvar.NsqTopicProcessParamsRequest, conf.Conf.NsqConf.NodeId), fmt.Sprintf(constvar.NsqTopicProcessParamsResponse, conf.Conf.NsqConf.NodeId))
+ var result common.ResponseProcessParams
+ err = caller.Call(common.RequestProcessParams{
+ WorkOrder: procedure.WorkOrderID,
+ OrderId: procedure.OrderID,
+ Product: order.ProductName,
+ Procedure: procedure.ProceduresInfo.ProcedureName,
+ 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
+ }
+ if result.ParamsMap == nil {
+ logx.Errorf("TaskStart GetProcessModel response miss process params:%v", result)
+ return
+ }
+ processModel = new(model.ProcessModel)
+ err = structx.AssignTo(result, &processModel)
+ return processModel, err
+ }
+ return
+}
+
+// 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).
+ SetStatus(model.OrderStatusWaitProcess).First()
+}
--
Gitblit v1.8.0