From d9de157184611738e0f8e27309b449bc11e2be75 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 20 十月 2023 16:08:47 +0800
Subject: [PATCH] fux
---
nsq/msg_handler.go | 12 +++++++++---
model/common/common.go | 3 ---
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/model/common/common.go b/model/common/common.go
index 9df61af..2bf3fcb 100644
--- a/model/common/common.go
+++ b/model/common/common.go
@@ -107,11 +107,8 @@
}
ResponseProcessParams struct {
Number string `json:"number"` //宸ヨ壓妯″瀷缂栧彿
- OrderId string `json:"orderId"` //璁㈠崟id
Product string `json:"product"` //浜у搧鍚嶇О
Procedure string `json:"procedure"` //宸ュ簭
- WorkOrder string `json:"workOrder"` //宸ュ崟
- Device string `json:"device"` //璁惧
Params string `json:"params"`
ParamsMap map[string]interface{} `json:"paramsMap"`
DeviceId string `json:"deviceId" gorm:"-"` //鐢ㄤ簬杩囨护鑾峰彇nsq娑堟伅
diff --git a/nsq/msg_handler.go b/nsq/msg_handler.go
index 461d810..423b7ac 100644
--- a/nsq/msg_handler.go
+++ b/nsq/msg_handler.go
@@ -214,11 +214,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).
@@ -226,7 +233,6 @@
if err != nil {
return err
}
- processModel.IsNew = true
return model.NewProcessModelSearch().SetOrm(db).Create(&processModel)
})
--
Gitblit v1.8.0