From 85161cadbaec116bfa0573959484a0b278cc65a7 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 01 十一月 2023 10:30:44 +0800
Subject: [PATCH] 接收设备信息时保存deviceMac字段
---
nsq/msg_handler.go | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/nsq/msg_handler.go b/nsq/msg_handler.go
index 3933b1f..e791fff 100644
--- a/nsq/msg_handler.go
+++ b/nsq/msg_handler.go
@@ -267,12 +267,15 @@
DeviceID: msg.ID,
Procedures: strings.Join(procedures, ","),
ExtChannelAmount: msg.ExtChannelAmount,
+ DeviceMac: msg.DeviceMac,
}
oldRecord, err := model.NewDeviceSearch().SetDeviceId(msg.ID).First()
if err == gorm.ErrRecordNotFound {
err = model.NewDeviceSearch().Create(deviceRecord)
- } else if oldRecord.ExtChannelAmount != deviceRecord.ExtChannelAmount || oldRecord.Procedures != deviceRecord.Procedures {
+ } else if oldRecord.ExtChannelAmount != deviceRecord.ExtChannelAmount ||
+ oldRecord.Procedures != deviceRecord.Procedures ||
+ oldRecord.DeviceMac != deviceRecord.DeviceMac {
err = model.NewDeviceSearch().SetDeviceId(msg.ID).Save(deviceRecord)
}
@@ -288,10 +291,6 @@
msg.PlcConfig.Method.ConvertToEnglish()
var record model.DevicePlc
err = mapstructure.Decode(msg.PlcConfig, &record)
- if err != nil {
- logx.Infof("decode from PlcAddressList to DevicePlc Details err:%v", err)
- }
- err = mapstructure.Decode(msg.PlcAddressList, &record.Details)
if err != nil {
logx.Infof("decode from PlcAddressList to DevicePlc Details err:%v", err)
}
--
Gitblit v1.8.0