从云端请求工艺参数，加入deviceId字段用于消息过滤

zhangqian

2023-09-02 74f8cd07a39795656573d4e4bb2fe85a6dadbb8c

从云端请求工艺参数，加入deviceId字段用于消息过滤

 model/common/common.go

@@ -74,6 +74,7 @@
        Product   string `json:"password"`                             // 产品
        Procedure string `json:"procedure"`                            // 工序
        Device    string `json:"device"`                               // 设备
        DeviceId  string `json:"deviceId" gorm:"-"`                    //用于过滤获取nsq消息
    }
    ResponseProcessParams struct {
        Number    string                 `json:"number"`    //工艺模型编号
@@ -84,5 +85,6 @@
        Device    string                 `json:"device"`    //设备
        Params    string                 `json:"params"`
        ParamsMap map[string]interface{} `json:"paramsMap"`
        DeviceId  string                 `json:"deviceId" gorm:"-"` //用于过滤获取nsq消息
    }
)

 service/task.go

@@ -120,7 +120,9 @@
            OrderId:   procedure.OrderID,
            Product:   order.ProductName,
            Procedure: procedure.ProceduresInfo.ProcedureName,
            Device:    procedure.ProceduresInfo.DeviceName}, &result, time.Second*3)
            Device:    procedure.ProceduresInfo.DeviceName,
            DeviceId:  conf.Conf.System.DeviceId,
        }, &result, time.Second*3)
        if err != nil {
            logx.Errorf("TaskStart GetProcessModel error:%v", err.Error())
            return