From 5e4d9f05035d1153ab191dd1cb0a4922b91983b2 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 11 十月 2023 14:36:37 +0800
Subject: [PATCH] debug
---
nsq/msg_handler.go | 61 +++++++++++++++++++++++++++---
1 files changed, 55 insertions(+), 6 deletions(-)
diff --git a/nsq/msg_handler.go b/nsq/msg_handler.go
index 713c95a..a01d9ea 100644
--- a/nsq/msg_handler.go
+++ b/nsq/msg_handler.go
@@ -11,9 +11,9 @@
"apsClient/utils/file"
"encoding/json"
"fmt"
+ "github.com/jinzhu/gorm"
"github.com/mitchellh/mapstructure"
"github.com/spf13/cast"
- "gorm.io/gorm"
"strings"
)
@@ -84,7 +84,7 @@
return err
}
for _, procedure := range procedureRecords {
- err = model.NewProceduresSearch(db).SetWorkOrderId(procedure.WorkOrderID).SetProcedureId(procedure.ProcedureID).Updates(procedure)
+ err = model.NewProceduresSearch(db).SetWorkOrderId(procedure.WorkOrderID).SetProcedureId(procedure.ProcedureID).Upsert(procedure)
if err != nil {
return err
}
@@ -98,7 +98,7 @@
return nil
})
if err != nil {
- logx.Errorf(" save task message error err: %v", err.Error())
+ logx.Errorf(" save task message error err: %v", err)
return err
}
}
@@ -170,8 +170,8 @@
}
detail, err := json.Marshal(record.Details)
record.Detail = string(detail)
- record.Id = 1
- err = model.NewDevicePlcSearch().SetId(record.Id).Save(&record)
+ record.ID = 1
+ err = model.NewDevicePlcSearch().SetId(record.ID).Save(&record)
if err != nil {
return err
}
@@ -219,10 +219,59 @@
logx.Infof("unmarshal process params sync err :%s", err)
return err
}
- err = model.NewProcessModelSearch().Save(&processModel)
+ err = model.WithTransaction(func(db *gorm.DB) error {
+ err = model.NewProcessModelSearch().SetOrm(db).SetProduct(processModel.Product).SetProcedure(processModel.Procedure).
+ UpdateByMap(map[string]interface{}{"is_new": 0})
+ if err != nil {
+ return err
+ }
+ processModel.IsNew = true
+ return model.NewProcessModelSearch().SetOrm(db).Create(&processModel)
+ })
+
if err != nil {
logx.Infof("save process params sync err :%s", err)
return err
}
return nil
}
+
+type DeviceUpdate struct {
+ Topic string
+}
+
+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)
+ 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 = append(procedures, attr.ProcedureName)
+ }
+
+ deviceRecord := &model.Device{
+ DeviceID: device.ID,
+ Procedures: strings.Join(procedures, ","),
+ ExtChannelAmount: device.ExtChannelAmount,
+ }
+
+ oldRecord, err := model.NewDeviceSearch().SetDeviceId(device.ID).First()
+ if err == gorm.ErrRecordNotFound {
+ err = model.NewDeviceSearch().Create(deviceRecord)
+ } else {
+ deviceRecord.ID = oldRecord.ID
+ err = model.NewDeviceSearch().Save(deviceRecord)
+ }
+
+ if err != nil {
+ logx.Infof("save device record err :%s", err)
+ return err
+ }
+
+ return nil
+}
--
Gitblit v1.8.0