From f008bf77342a93c13d1e42399dd175c9c941d3ef Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 03 十一月 2023 21:05:16 +0800
Subject: [PATCH] 工艺参数地址表从文件里获取改成从数据库查询
---
nsq/msg_handler.go | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/nsq/msg_handler.go b/nsq/msg_handler.go
index e791fff..dea2aca 100644
--- a/nsq/msg_handler.go
+++ b/nsq/msg_handler.go
@@ -345,6 +345,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)
@@ -393,5 +395,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