From bc7ee359dfe4e66a05c2cca9deb7a945534009f3 Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期五, 20 十月 2023 18:30:26 +0800 Subject: [PATCH] 删除不再用的topic,增加初始化的时候,设备拉取 --- nsq/msg_handler.go | 36 +++++++++++++++++++++++++++++++++++- 1 files changed, 35 insertions(+), 1 deletions(-) diff --git a/nsq/msg_handler.go b/nsq/msg_handler.go index 15cbf29..3e1f160 100644 --- a/nsq/msg_handler.go +++ b/nsq/msg_handler.go @@ -299,7 +299,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 +347,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