From 5a9e2e97e78a05209a57a75a75678d67c32c58d5 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 21 十月 2023 11:25:20 +0800
Subject: [PATCH] debug over
---
nsq/msg_handler.go | 84 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 74 insertions(+), 10 deletions(-)
diff --git a/nsq/msg_handler.go b/nsq/msg_handler.go
index 15cbf29..335c143 100644
--- a/nsq/msg_handler.go
+++ b/nsq/msg_handler.go
@@ -251,33 +251,63 @@
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 {
+ err = model.NewDevicePlcSearch().SetDeviceId(msg.ID).Save(&record)
+ }
+ if err != nil {
return err
}
@@ -299,7 +329,8 @@
switch pullDataResponse.DataType {
case common.PullDataTypeProcessModel:
err = slf.DealProcessModelData(pullDataResponse.Data)
-
+ case common.PullDataTypeDevice:
+ err = slf.DealDeviceData(pullDataResponse.Data)
}
if err != nil {
logx.Infof("process pull data err :%s", err)
@@ -346,3 +377,36 @@
}
return nil
}
+
+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
+}
--
Gitblit v1.8.0