From 8f692efa28cb68b9644d473aedc5caeee2496a61 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 26 十月 2023 17:11:17 +0800
Subject: [PATCH] 接收云端下发的modbusRTU配置
---
nsq/msg_handler.go | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/nsq/msg_handler.go b/nsq/msg_handler.go
index 0b3d0d5..3933b1f 100644
--- a/nsq/msg_handler.go
+++ b/nsq/msg_handler.go
@@ -301,15 +301,25 @@
oldPlcRecord, err := model.NewDevicePlcSearch().SetDeviceId(msg.ID).First()
if err == gorm.ErrRecordNotFound {
err = model.NewDevicePlcSearch().Create(&record)
- } else if record.Port != oldPlcRecord.Port ||
- record.Method != oldPlcRecord.Method ||
+ } else if record.Port != oldPlcRecord.Port || record.Method != oldPlcRecord.Method ||
record.Address != oldPlcRecord.Address ||
- record.Detail != oldPlcRecord.Detail {
+ record.Detail != oldPlcRecord.Detail ||
+ record.BaudRate != oldPlcRecord.BaudRate ||
+ record.SerialName != oldPlcRecord.SerialName ||
+ record.DataBit != oldPlcRecord.DataBit ||
+ record.StopBit != oldPlcRecord.StopBit ||
+ record.Parity != oldPlcRecord.Parity {
- oldPlcRecord.Port = record.Port
oldPlcRecord.Method = record.Method
oldPlcRecord.Address = record.Address
+ oldPlcRecord.Port = record.Port
oldPlcRecord.Detail = record.Detail
+ oldPlcRecord.BaudRate = record.BaudRate
+ oldPlcRecord.SerialName = record.SerialName
+ oldPlcRecord.DataBit = record.DataBit
+ oldPlcRecord.StopBit = record.StopBit
+ oldPlcRecord.Parity = record.Parity
+
err = model.NewDevicePlcSearch().Save(oldPlcRecord)
}
if err != nil {
--
Gitblit v1.8.0