From 9a240b711d25f57703b9cf104eb602969437541e Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 20 十月 2023 21:52:42 +0800
Subject: [PATCH] 合并设备和plc配置
---
nsq/msg_handler.go | 40 +++++++++++++++++++++++++++++++---------
1 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/nsq/msg_handler.go b/nsq/msg_handler.go
index 3e1f160..1ad713a 100644
--- a/nsq/msg_handler.go
+++ b/nsq/msg_handler.go
@@ -251,29 +251,29 @@
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 {
@@ -281,6 +281,28 @@
return err
}
+ if 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.ID = 1
+ err = model.NewDevicePlcSearch().SetId(record.ID).Save(&record)
+ if err != nil {
+ return err
+ }
+
return nil
}
--
Gitblit v1.8.0