From b555874608be2e4bb40cceba60b497c04caef842 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 12 九月 2023 14:17:51 +0800
Subject: [PATCH] 三菱协议更改
---
nsq/msg_handler.go | 115 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 79 insertions(+), 36 deletions(-)
diff --git a/nsq/msg_handler.go b/nsq/msg_handler.go
index 69ca36e..180f1b5 100644
--- a/nsq/msg_handler.go
+++ b/nsq/msg_handler.go
@@ -43,41 +43,63 @@
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))
+ procedureIds := make([]string, 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)
+ procedureRecord := model.Procedures{
+ WorkOrderID: task.WorkOrder.WorkOrderID,
+ OrderID: task.WorkOrder.OrderID,
+ DeviceID: procedure.DeviceID,
+ ProcedureID: procedure.ProcedureID,
+ StartTime: procedure.StartTime,
+ EndTime: procedure.EndTime,
+ Status: model.ProcedureStatusWaitProcess,
+ ProceduresInfo: common.ProductProcedure{},
+ }
+ procedureData, err := json.Marshal(procedure)
+ if err != nil {
+ return err
+ }
+ procedureRecord.ProcedureData = string(procedureData)
+ procedureRecords = append(procedureRecords, &procedureRecord)
+ procedureIds = append(procedureIds, procedure.ProcedureID)
+ }
+
+ 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 oldWorkOrder != nil && oldWorkOrder.WorkOrderID != "" {
+ if err = model.NewOrderSearch(db).SetId(oldWorkOrder.ID).Updates(&orderRecord); err != nil {
+ return err
+ }
+ for _, procedure := range procedureRecords {
+ err = model.NewProceduresSearch(db).SetWorkOrderId(procedure.WorkOrderID).SetProcedureId(procedure.ProcedureID).Updates(procedure)
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())
}
+ } else {
+ if err = model.NewOrderSearch(db).Create(&orderRecord); err != nil {
+ return err
+ }
+ return model.NewProceduresSearch(db).CreateBatch(procedureRecords)
}
+ return nil
+ })
+ if err != nil {
+ logx.Errorf(" save task message error err: %v", err.Error())
+ return err
}
}
return nil
@@ -93,7 +115,18 @@
err = json.Unmarshal(data, &resp)
if err != nil {
logx.Errorf("ScheduleTask HandleMessage Unmarshal json err: %v", err.Error())
- return err
+ return nil
+ }
+ if resp.DeviceId != conf.Conf.System.DeviceId {
+ return nil
+ }
+ //閫氱煡鍥炲鏀跺埌
+ ReceivedMessageChan <- &ReceivedMessage{
+ Topic: slf.Topic,
+ Message: data,
+ }
+ if len(resp.KeyData) == 0 || len(resp.AddressData) == 0 {
+ return nil
}
//鍐欏叆鍒版枃浠�
err = file.WriteFile(fmt.Sprintf("%s%s", constvar.PlcAddressDataPath, constvar.PlcAddressDataKeyFileName), resp.KeyData)
@@ -120,11 +153,6 @@
plc_address.Set(key, address)
logx.Infof("plc address set ok: key:%v, address:%v", key, address)
}
- //閫氱煡鍥炲鏀跺埌
- ReceivedMessageChan <- &ReceivedMessage{
- Topic: slf.Topic,
- Message: data,
- }
return nil
}
@@ -134,6 +162,21 @@
func (slf *ProcessParams) HandleMessage(data []byte) (err error) {
logx.Infof("get an process params message :%s", data)
+ var processModel model.ProcessModel
+ err = json.Unmarshal(data, &processModel)
+ if err != nil {
+ logx.Infof("unmarshal process params sync err :%s", err)
+ return 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{
Topic: slf.Topic,
@@ -154,7 +197,7 @@
logx.Infof("unmarshal process params sync err :%s", err)
return err
}
- err = model.NewProcessModelSearch().Create(&processModel)
+ err = model.NewProcessModelSearch().Save(&processModel)
if err != nil {
logx.Infof("save process params sync err :%s", err)
return err
--
Gitblit v1.8.0