From 001d1f605c0a275a139f5c8fa66e631eb998e3b9 Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期六, 02 九月 2023 14:35:10 +0800 Subject: [PATCH] 存储全部设备的工序和订单&代码优化 --- nsq/msg_handler.go | 84 ++++++++++++++++++++++++------------------ 1 files changed, 48 insertions(+), 36 deletions(-) diff --git a/nsq/msg_handler.go b/nsq/msg_handler.go index b7a168b..af96211 100644 --- a/nsq/msg_handler.go +++ b/nsq/msg_handler.go @@ -43,41 +43,48 @@ return err } for _, task := range tasks { + oldWorkOrder, err := model.NewOrderSearch(nil).SetWorkOrderId(task.WorkOrder.WorkOrderID).First() + if oldWorkOrder != nil && oldWorkOrder.WorkOrderID != "" && oldWorkOrder.Status != model.OrderStatusWaitProcess { //宸插紑濮嬬殑宸ュ簭涓嶅彲浠ヤ慨鏀� + continue + } + + procedureRecords := make([]*model.Procedures, 0, len(task.Procedures)) for _, procedure := range task.Procedures { - if procedure.DeviceID == conf.Conf.System.DeviceId { //鍙瓨鍌ㄦ湰璁惧鐨勫伐搴� - err = model.WithTransaction(func(db *gorm.DB) error { - _, err := model.NewOrderSearch(db).SetWorkOrderId(task.WorkOrder.WorkOrderID).First() - if err == gorm.ErrRecordNotFound { - var orderRecord model.Order - err = structx.AssignTo(task.WorkOrder, &orderRecord) - orderRecord.Status = model.OrderStatusWaitProcess - if err != nil { - logx.Errorf(" structx.Assign task.Order to orderRecord err: %v", err.Error()) - return err - } - if err = model.NewOrderSearch(db).Create(&orderRecord); err != nil { - return err - } - } - procedureRecord := model.Procedures{ - StartTime: procedure.StartTime, - EndTime: procedure.EndTime, - WorkOrderID: task.WorkOrder.WorkOrderID, - OrderID: task.WorkOrder.OrderID, - Status: model.ProcedureStatusWaitProcess, - } - procedureData, err := json.Marshal(procedure) - procedureRecord.ProcedureData = string(procedureData) - if err != nil { - logx.Errorf(" json.Marshal(procedure) err: %v", err.Error()) - return err - } - return model.NewProceduresSearch(db).Create(&procedureRecord) - }) - if err != nil { - logx.Errorf(" save procedure err: %v", err.Error()) - } + procedureRecord := model.Procedures{ + WorkOrderID: task.WorkOrder.WorkOrderID, + OrderID: task.WorkOrder.OrderID, + DeviceID: procedure.DeviceID, + StartTime: procedure.StartTime, + EndTime: procedure.EndTime, + Status: model.ProcedureStatusWaitProcess, + ProcedureData: "", + ProceduresInfo: common.ProductProcedure{}, } + procedureData, err := json.Marshal(procedure) + if err != nil { + return err + } + procedureRecord.ProcedureData = string(procedureData) + procedureRecords = append(procedureRecords, &procedureRecord) + } + + var orderRecord model.Order + err = structx.AssignTo(task.WorkOrder, &orderRecord) + orderRecord.Status = model.OrderStatusWaitProcess + if err != nil { + logx.Errorf(" structx.Assign task.Order to orderRecord err: %v", err.Error()) + return err + } + + err = model.WithTransaction(func(db *gorm.DB) error { + if err = model.NewOrderSearch(db).Save(&orderRecord); err != nil { + return err + } + return model.NewProceduresSearch(db).CreateBatch(procedureRecords) + }) + if err != nil { + logx.Errorf(" save task message error err: %v", err.Error()) + return err } } return nil @@ -140,9 +147,14 @@ logx.Infof("unmarshal process params sync err :%s", err) return err } - err = model.NewProcessModelSearch().Create(&processModel) - if err != nil { - logx.Infof("save process params err :%s", err) + if processModel.DeviceId != conf.Conf.System.DeviceId { //涓嶆槸鍙戠粰鏈澶囩殑娑堟伅 + return nil + } + if processModel.Params != "" { + err = model.NewProcessModelSearch().Create(&processModel) + if err != nil { + logx.Infof("save process params err :%s", err) + } } //閫氱煡鍥炲鏀跺埌 ReceivedMessageChan <- &ReceivedMessage{ -- Gitblit v1.8.0