From 313dc7a884e8db3d8597c8eb0003b1f0ae92ca63 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 01 九月 2023 21:40:12 +0800
Subject: [PATCH] fix
---
nsq/msg_handler.go | 10 ++++++++++
model/procedures.go | 6 ++++++
model/process_model.go | 2 +-
api/v1/task.go | 2 +-
4 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index 377ba71..d07c123 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -142,7 +142,7 @@
}
processParamsArr := make([]response.ProcessParams, 0, len(paramsMap))
- for k, v := range data.ParamsMap {
+ for k, v := range paramsMap {
processParamsArr = append(processParamsArr, response.ProcessParams{
Key: k,
Value: v,
diff --git a/model/procedures.go b/model/procedures.go
index 48534b3..a8eb474 100644
--- a/model/procedures.go
+++ b/model/procedures.go
@@ -15,6 +15,7 @@
ID int `gorm:"primarykey"`
WorkOrderID string `gorm:"index;type:varchar(191);not null;comment:宸ュ崟ID" json:"-"`
OrderID string `gorm:"index;type:varchar(191);not null;comment:璁㈠崟ID" json:"-"`
+ DeviceID string `gorm:"type:varchar(191);comment:璁惧ID" json:"deviceId"`
StartTime int64 `gorm:"comment:璁″垝寮�濮嬫椂闂�" json:"startTime"`
EndTime int64 `gorm:"comment:璁″垝缁撴潫鏃堕棿" json:"endTime"`
Status ProcedureStatus
@@ -92,6 +93,11 @@
return slf
}
+func (slf *ProceduresSearch) SetDeviceId(id string) *ProceduresSearch {
+ slf.DeviceID = id
+ return slf
+}
+
func (slf *ProceduresSearch) SetStatus(status ProcedureStatus) *ProceduresSearch {
slf.Status = status
return slf
diff --git a/model/process_model.go b/model/process_model.go
index e217d51..9a15886 100644
--- a/model/process_model.go
+++ b/model/process_model.go
@@ -16,7 +16,7 @@
Procedure string `gorm:"column:procedure;type:varchar(255);not null;default '';comment:宸ュ簭" json:"procedure"` //宸ュ簭
WorkOrder string `gorm:"column:work_order;type:varchar(255);not null;default '';comment:宸ュ崟" json:"workOrder"` //宸ュ崟
Device string `gorm:"column:device;type:varchar(255);not null;default '';comment:璁惧" json:"device"` //璁惧
- Params string `json:"-" gorm:"type:text;comment:宸ヨ壓鍙傛暟閿�煎json涓�"`
+ Params string `gorm:"type:text;comment:宸ヨ壓鍙傛暟閿�煎json涓�"`
ParamsMap map[string]interface{} `json:"paramsMap" gorm:"-"`
}
diff --git a/nsq/msg_handler.go b/nsq/msg_handler.go
index 69ca36e..b7a168b 100644
--- a/nsq/msg_handler.go
+++ b/nsq/msg_handler.go
@@ -134,6 +134,16 @@
func (slf *ProcessParams) HandleMessage(data []byte) (err error) {
logx.Infof("get an process params message :%s", data)
+ var processModel model.ProcessModel
+ err = json.Unmarshal(data, &processModel)
+ if err != nil {
+ logx.Infof("unmarshal process params sync err :%s", err)
+ return err
+ }
+ err = model.NewProcessModelSearch().Create(&processModel)
+ if err != nil {
+ logx.Infof("save process params err :%s", err)
+ }
//閫氱煡鍥炲鏀跺埌
ReceivedMessageChan <- &ReceivedMessage{
Topic: slf.Topic,
--
Gitblit v1.8.0