From 7276ab65576ec73b439a40d7f1a3035a534b968c Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 20 十月 2023 19:12:40 +0800
Subject: [PATCH] 停止消费时关闭tcp连接
---
nsq/msg_handler.go | 45 +++++++++++++++++++++++++++++++++++----------
1 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/nsq/msg_handler.go b/nsq/msg_handler.go
index 6c646e6..3e1f160 100644
--- a/nsq/msg_handler.go
+++ b/nsq/msg_handler.go
@@ -82,31 +82,22 @@
var err error
if oldWorkOrder != nil && oldWorkOrder.WorkOrderID != "" {
if err = model.NewOrderSearch(db).SetId(oldWorkOrder.ID).Updates(&orderRecord); err != nil {
- logx.Errorf(" save task message error err1: %v", err)
return err
}
- logx.Errorf(" save task message error no err1: %v", err)
for _, procedure := range procedureRecords {
err = model.NewProceduresSearch(db).SetWorkOrderId(procedure.WorkOrderID).SetProcedureId(procedure.ProcedureID).Upsert(procedure)
if err != nil {
- logx.Errorf(" save task message error err2: %v", err)
return err
}
}
- logx.Errorf(" save task message error no err2: %v", err)
} else {
if err = model.NewOrderSearch(db).Create(&orderRecord); err != nil {
- logx.Errorf(" save task message error err3: %v", err)
return err
}
- logx.Errorf(" save task message error no err3: %v", err)
if err = model.NewProceduresSearch(db).CreateBatch(procedureRecords); err != nil {
- logx.Errorf(" save task message error err4: %v", err)
return err
}
- logx.Errorf(" save task message error no err4: %v", err)
}
- logx.Errorf(" save task message error no err5: %v", err)
return nil
})
if err != nil {
@@ -308,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)
@@ -355,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