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 | 94 +++++++++++++++++++++++++++-------------------
1 files changed, 55 insertions(+), 39 deletions(-)
diff --git a/nsq/msg_handler.go b/nsq/msg_handler.go
index 3e1f160..3933b1f 100644
--- a/nsq/msg_handler.go
+++ b/nsq/msg_handler.go
@@ -251,33 +251,78 @@
func (slf *DeviceUpdate) HandleMessage(data []byte) (err error) {
logx.Infof("get a device update message :%s", data)
- var device common.Device
- err = json.Unmarshal(data, &device)
+ var msg common.DeviceMsg
+ err = json.Unmarshal(data, &msg)
if err != nil {
logx.Infof("unmarshal device update msg err :%s", err)
return err
}
- procedures := make([]string, 0, len(device.DeviceProcedureAttr))
- for _, attr := range device.DeviceProcedureAttr {
+ procedures := make([]string, 0, len(msg.DeviceProcedureAttr))
+ for _, attr := range msg.DeviceProcedureAttr {
procedures = append(procedures, attr.ProcedureName)
}
deviceRecord := &model.Device{
- DeviceID: device.ID,
+ DeviceID: msg.ID,
Procedures: strings.Join(procedures, ","),
- ExtChannelAmount: device.ExtChannelAmount,
+ ExtChannelAmount: msg.ExtChannelAmount,
}
- oldRecord, err := model.NewDeviceSearch().SetDeviceId(device.ID).First()
+ oldRecord, err := model.NewDeviceSearch().SetDeviceId(msg.ID).First()
if err == gorm.ErrRecordNotFound {
err = model.NewDeviceSearch().Create(deviceRecord)
- } else {
- err = model.NewDeviceSearch().SetID(oldRecord.ID).Save(deviceRecord)
+ } else if oldRecord.ExtChannelAmount != deviceRecord.ExtChannelAmount || oldRecord.Procedures != deviceRecord.Procedures {
+ err = model.NewDeviceSearch().SetDeviceId(msg.ID).Save(deviceRecord)
}
if err != nil {
logx.Infof("save device record err :%s", err)
+ return err
+ }
+
+ if msg.PlcConfig == nil || msg.PlcConfig.Method == "" {
+ return nil
+ }
+
+ 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)
+ }
+ detail, err := json.Marshal(record.Details)
+ record.Detail = string(detail)
+ 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
}
@@ -349,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