From cacf363f222e354cad6db18c4a00fb1097d35c2c Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 09 十一月 2023 14:30:58 +0800
Subject: [PATCH] fix
---
nsq/msg_handler.go | 46 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/nsq/msg_handler.go b/nsq/msg_handler.go
index 3933b1f..82d2118 100644
--- a/nsq/msg_handler.go
+++ b/nsq/msg_handler.go
@@ -267,12 +267,17 @@
DeviceID: msg.ID,
Procedures: strings.Join(procedures, ","),
ExtChannelAmount: msg.ExtChannelAmount,
+ DeviceMac: msg.DeviceMac,
+ DeviceName: msg.DeviceName,
}
oldRecord, err := model.NewDeviceSearch().SetDeviceId(msg.ID).First()
if err == gorm.ErrRecordNotFound {
err = model.NewDeviceSearch().Create(deviceRecord)
- } else if oldRecord.ExtChannelAmount != deviceRecord.ExtChannelAmount || oldRecord.Procedures != deviceRecord.Procedures {
+ } else if oldRecord.ExtChannelAmount != deviceRecord.ExtChannelAmount ||
+ oldRecord.Procedures != deviceRecord.Procedures ||
+ oldRecord.DeviceMac != deviceRecord.DeviceMac ||
+ oldRecord.DeviceName != deviceRecord.DeviceName {
err = model.NewDeviceSearch().SetDeviceId(msg.ID).Save(deviceRecord)
}
@@ -288,10 +293,6 @@
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)
}
@@ -346,6 +347,8 @@
err = slf.DealProcessModelData(pullDataResponse.Data)
case common.PullDataTypeDevice:
err = slf.DealDeviceData(pullDataResponse.Data)
+ case common.PullDataTypeProcessModelPlcAddress:
+ err = slf.DealProcessModelPlcAddressData(pullDataResponse.Data)
}
if err != nil {
logx.Infof("process pull data err :%s", err)
@@ -394,5 +397,38 @@
}
func (slf *PullDataResponse) DealDeviceData(data interface{}) error {
+ //宸插湪鍒殑topic澶勭悊
+ return nil
+}
+
+func (slf *PullDataResponse) DealProcessModelPlcAddressData(data interface{}) error {
+ var addressList []*model.ProcessModelPlcAddress
+ err := mapstructure.Decode(data, &addressList)
+ if err != nil {
+ return err
+ }
+ deviceIDs := make([]string, 0, len(addressList))
+ for _, item := range addressList {
+ deviceIDs = append(deviceIDs, item.DeviceID)
+ }
+ existsRecords, err := model.NewProcessModelPlcAddressSearch().SetDeviceIDs(deviceIDs).FindNotTotal()
+ if err != nil {
+ return err
+ }
+
+ existsRecordsMap := make(map[string]*model.ProcessModelPlcAddress, len(existsRecords))
+ for _, item := range existsRecords {
+ existsRecordsMap[item.DeviceID] = item
+ }
+
+ for _, item := range addressList {
+ if v, exists := existsRecordsMap[item.DeviceID]; !exists {
+ item.ID = 0
+ err = model.NewProcessModelPlcAddressSearch().Create(item)
+ } else if v.Address != item.Address {
+ v.Address = item.Address
+ err = model.NewProcessModelPlcAddressSearch().Save(v)
+ }
+ }
return nil
}
--
Gitblit v1.8.0