From d440849e7acbd04b389dae5f3bbb0769dacb264e Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 09 十月 2023 19:19:41 +0800
Subject: [PATCH] merge master
---
nsq/msg_handler.go | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/nsq/msg_handler.go b/nsq/msg_handler.go
index 7b62157..86c8df2 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"
)
@@ -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,7 +219,16 @@
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
--
Gitblit v1.8.0