From cf96f6bc1fb484fde16bd5ed6d49534c96958022 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 25 九月 2023 15:43:12 +0800
Subject: [PATCH] fix
---
nsq/msg_handler.go | 74 ++++++++++++++++++++++++-------------
1 files changed, 48 insertions(+), 26 deletions(-)
diff --git a/nsq/msg_handler.go b/nsq/msg_handler.go
index 180f1b5..713c95a 100644
--- a/nsq/msg_handler.go
+++ b/nsq/msg_handler.go
@@ -11,6 +11,7 @@
"apsClient/utils/file"
"encoding/json"
"fmt"
+ "github.com/mitchellh/mapstructure"
"github.com/spf13/cast"
"gorm.io/gorm"
"strings"
@@ -49,7 +50,6 @@
}
procedureRecords := make([]*model.Procedures, 0, len(task.Procedures))
- procedureIds := make([]string, 0, len(task.Procedures))
for _, procedure := range task.Procedures {
procedureRecord := model.Procedures{
WorkOrderID: task.WorkOrder.WorkOrderID,
@@ -59,6 +59,7 @@
StartTime: procedure.StartTime,
EndTime: procedure.EndTime,
Status: model.ProcedureStatusWaitProcess,
+ Channel: procedure.Channel,
ProceduresInfo: common.ProductProcedure{},
}
procedureData, err := json.Marshal(procedure)
@@ -67,7 +68,6 @@
}
procedureRecord.ProcedureData = string(procedureData)
procedureRecords = append(procedureRecords, &procedureRecord)
- procedureIds = append(procedureIds, procedure.ProcedureID)
}
var orderRecord model.Order
@@ -125,33 +125,55 @@
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)
- if err != nil {
- return err
- }
- err = file.WriteFile(fmt.Sprintf("%s%s", constvar.PlcAddressDataPath, constvar.PlcAddressDataValueFileName), resp.AddressData)
- if err != nil {
- return err
- }
- //鍐欏叆鍒板唴瀛�
- keyString := string(resp.KeyData)
- addressString := string(resp.AddressData)
+ if len(resp.KeyData) != 0 && len(resp.AddressData) != 0 {
+ //鍐欏叆鍒版枃浠�
+ err = file.WriteFile(fmt.Sprintf("%s%s", constvar.PlcAddressDataPath, constvar.PlcAddressDataKeyFileName), resp.KeyData)
+ if err != nil {
+ return err
+ }
+ err = file.WriteFile(fmt.Sprintf("%s%s", constvar.PlcAddressDataPath, constvar.PlcAddressDataValueFileName), resp.AddressData)
+ if err != nil {
+ return err
+ }
+ //鍐欏叆鍒板唴瀛�
+ keyString := string(resp.KeyData)
+ addressString := string(resp.AddressData)
- keys := strings.Split(keyString, "\n")
- addresses := strings.Split(addressString, "\n")
- if len(keys) != len(addresses) {
- logx.Error("plc address message error: key length not equal address length")
+ keys := strings.Split(keyString, "\n")
+ addresses := strings.Split(addressString, "\n")
+ if len(keys) != len(addresses) {
+ logx.Error("plc address message error: key length not equal address length")
+ return nil
+ }
+ for i := 0; i < len(keys); i++ {
+ key := strings.ReplaceAll(keys[i], "\r", "")
+ address := cast.ToInt(strings.ReplaceAll(addresses[i], "\r", ""))
+ plc_address.Set(key, address)
+ logx.Infof("plc address set ok: key:%v, address:%v", key, address)
+ }
+ }
+
+ if resp.PlcConfig.Method == "" {
return nil
}
- for i := 0; i < len(keys); i++ {
- key := strings.ReplaceAll(keys[i], "\r", "")
- address := cast.ToInt(strings.ReplaceAll(addresses[i], "\r", ""))
- plc_address.Set(key, address)
- logx.Infof("plc address set ok: key:%v, address:%v", key, address)
+
+ resp.PlcConfig.Method.ConvertToEnglish()
+
+ var record model.DevicePlc
+ err = mapstructure.Decode(resp.PlcConfig, &record)
+ if err != nil {
+ logx.Infof("decode from PlcAddressList to DevicePlc Details err:%v", err)
+ }
+ err = mapstructure.Decode(resp.PlcAddressList, &record.Details)
+ if err != nil {
+ logx.Infof("decode from PlcAddressList to DevicePlc Details err:%v", err)
+ }
+ detail, err := json.Marshal(record.Details)
+ record.Detail = string(detail)
+ record.Id = 1
+ err = model.NewDevicePlcSearch().SetId(record.Id).Save(&record)
+ if err != nil {
+ return err
}
return nil
}
--
Gitblit v1.8.0