From 10c65da3d2af7056f48d9301e83f53f102f76e18 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 30 十月 2023 14:52:11 +0800
Subject: [PATCH] fix
---
nsq/msg_handler.go | 60 +++++++++++++++++++++++++++---------------------------------
1 files changed, 27 insertions(+), 33 deletions(-)
diff --git a/nsq/msg_handler.go b/nsq/msg_handler.go
index 1ad713a..3933b1f 100644
--- a/nsq/msg_handler.go
+++ b/nsq/msg_handler.go
@@ -281,7 +281,7 @@
return err
}
- if msg.PlcConfig.Method == "" {
+ if msg.PlcConfig == nil || msg.PlcConfig.Method == "" {
return nil
}
@@ -297,8 +297,31 @@
}
detail, err := json.Marshal(record.Details)
record.Detail = string(detail)
- record.ID = 1
- err = model.NewDevicePlcSearch().SetId(record.ID).Save(&record)
+ record.DeviceID = msg.ID
+ 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 ||
+ record.Address != oldPlcRecord.Address ||
+ 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.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 {
return err
}
@@ -371,34 +394,5 @@
}
func (slf *PullDataResponse) DealDeviceData(data interface{}) error {
- var devices []*model.Device
- err := mapstructure.Decode(data, &devices)
- if err != nil {
- return err
- }
- numbers := make([]string, 0, len(devices))
- for _, item := range devices {
- numbers = append(numbers, item.DeviceID)
- }
- existsDevices, err := model.NewDeviceSearch().SetDeviceIds(numbers).FindNotTotal()
- if err != nil {
- return err
- }
-
- existsDeviceMap := make(map[string]*model.Device, len(existsDevices))
- for _, device := range existsDevices {
- existsDeviceMap[device.DeviceID] = device
- }
-
- for _, device := range devices {
- if oldDevice, exists := existsDeviceMap[device.DeviceID]; exists {
- if oldDevice.ExtChannelAmount != device.ExtChannelAmount || //todo to be continued
- oldDevice.Procedures != device.Procedures {
- err = model.NewDeviceSearch().SetDeviceId(device.DeviceID).Save(device)
- }
- } else {
- err = model.NewDeviceSearch().Create(device)
- }
- }
- return err
+ return nil
}
--
Gitblit v1.8.0