From 50fdb4bc0545136c14b7b1b50c55430e5c8d970a Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 20 十月 2023 17:03:04 +0800
Subject: [PATCH] 删除或改造gorm v1不支持的批量保存方法
---
nsq/msg_handler.go | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/nsq/msg_handler.go b/nsq/msg_handler.go
index 1db651e..15cbf29 100644
--- a/nsq/msg_handler.go
+++ b/nsq/msg_handler.go
@@ -79,6 +79,7 @@
}
err = model.WithTransaction(func(db *gorm.DB) error {
+ var err error
if oldWorkOrder != nil && oldWorkOrder.WorkOrderID != "" {
if err = model.NewOrderSearch(db).SetId(oldWorkOrder.ID).Updates(&orderRecord); err != nil {
return err
@@ -93,7 +94,9 @@
if err = model.NewOrderSearch(db).Create(&orderRecord); err != nil {
return err
}
- return model.NewProceduresSearch(db).CreateBatch(procedureRecords)
+ if err = model.NewProceduresSearch(db).CreateBatch(procedureRecords); err != nil {
+ return err
+ }
}
return nil
})
@@ -213,11 +216,18 @@
func (slf *ProcessParamsSync) HandleMessage(data []byte) (err error) {
logx.Infof("get an process params sync message :%s", data)
- var processModel model.ProcessModel
- err = json.Unmarshal(data, &processModel)
+ var processModelMsg common.ResponseProcessParams
+ err = json.Unmarshal(data, &processModelMsg)
if err != nil {
logx.Infof("unmarshal process params sync err :%s", err)
return err
+ }
+ processModel := model.ProcessModel{
+ Number: processModelMsg.Number,
+ Product: processModelMsg.Product,
+ Procedure: processModelMsg.Procedure,
+ Params: processModelMsg.Params,
+ IsNew: true,
}
err = model.WithTransaction(func(db *gorm.DB) error {
err = model.NewProcessModelSearch().SetOrm(db).SetProduct(processModel.Product).SetProcedure(processModel.Procedure).
@@ -225,7 +235,6 @@
if err != nil {
return err
}
- processModel.IsNew = true
return model.NewProcessModelSearch().SetOrm(db).Create(&processModel)
})
@@ -264,8 +273,7 @@
if err == gorm.ErrRecordNotFound {
err = model.NewDeviceSearch().Create(deviceRecord)
} else {
- deviceRecord.ID = oldRecord.ID
- err = model.NewDeviceSearch().Save(deviceRecord)
+ err = model.NewDeviceSearch().SetID(oldRecord.ID).Save(deviceRecord)
}
if err != nil {
--
Gitblit v1.8.0