From f91232c13c2682a6cf9ef4b46ecadee8deb372fd Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 21 十月 2023 17:57:53 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/apsClient
---
nsq/msg_handler.go | 40 +++++++---------------------------------
1 files changed, 7 insertions(+), 33 deletions(-)
diff --git a/nsq/msg_handler.go b/nsq/msg_handler.go
index 00d7edd..0b3d0d5 100644
--- a/nsq/msg_handler.go
+++ b/nsq/msg_handler.go
@@ -299,15 +299,18 @@
record.Detail = string(detail)
record.DeviceID = msg.ID
oldPlcRecord, err := model.NewDevicePlcSearch().SetDeviceId(msg.ID).First()
- logx.Errorf("-------------------------------plc record not found:%v", err)
if err == gorm.ErrRecordNotFound {
- logx.Errorf("-------------------------------plc record not found:%v", err)
err = model.NewDevicePlcSearch().Create(&record)
} else if record.Port != oldPlcRecord.Port ||
record.Method != oldPlcRecord.Method ||
record.Address != oldPlcRecord.Address ||
record.Detail != oldPlcRecord.Detail {
- err = model.NewDevicePlcSearch().SetDeviceId(msg.ID).Save(&record)
+
+ oldPlcRecord.Port = record.Port
+ oldPlcRecord.Method = record.Method
+ oldPlcRecord.Address = record.Address
+ oldPlcRecord.Detail = record.Detail
+ err = model.NewDevicePlcSearch().Save(oldPlcRecord)
}
if err != nil {
return err
@@ -381,34 +384,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