From 369026325416d187b7b0a0fbe8b5fd1895515bbb Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 22 八月 2023 18:18:15 +0800
Subject: [PATCH] 获取工艺参数用nsq方式获取
---
api/v1/task.go | 39 ++++++++++++++++++++++++++++++---------
1 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index b0719bc..cf295c5 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -76,31 +76,52 @@
ctx.Fail(ecode.UnknownErr)
return
}
- params := service.GetProcessModelParams{
+ //params := service.GetProcessModelParams{
+ // WorkOrder: procedure.WorkOrderID,
+ // OrderId: procedure.OrderID,
+ // Product: order.ProductName,
+ // Procedure: procedure.ProceduresInfo.ProcedureName,
+ // Device: procedure.ProceduresInfo.DeviceName,
+ //}
+ //resp, err := service.ProcessModel{}.GetProcessModel(params)
+ //if err != nil {
+ // logx.Errorf("TaskStart GetProcessModel error: %v", err.Error())
+ // ctx.FailWithMsg(ecode.UnknownErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟")
+ // return
+ //}
+
+ caller := nsq.NewCaller(fmt.Sprintf(constvar.NsqTopicProcessParamsRequest, conf.Conf.NsqConf.NodeId), fmt.Sprintf(constvar.NsqTopicProcessParamsResponse, conf.Conf.NsqConf.NodeId))
+ var result common.ResponseProcessParams
+
+ err = caller.Call(common.RequestProcessParams{
WorkOrder: procedure.WorkOrderID,
OrderId: procedure.OrderID,
Product: order.ProductName,
Procedure: procedure.ProceduresInfo.ProcedureName,
- Device: procedure.ProceduresInfo.DeviceName,
- }
- resp, err := service.ProcessModel{}.GetProcessModel(params)
+ Device: procedure.ProceduresInfo.DeviceName}, &result, time.Second*5)
if err != nil {
- logx.Errorf("TaskStart Notice GetProcessModel error: %v", err.Error())
+ logx.Errorf("TaskStart GetProcessModel error:%v", err.Error())
ctx.FailWithMsg(ecode.UnknownErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟")
return
}
- processParamsArr := make([]response.ProcessParams, 0, len(resp.ParamsMap))
- for k, v := range resp.ParamsMap {
+ if result.ParamsMap == nil {
+ logx.Errorf("TaskStart GetProcessModel response miss process params:%v", result)
+ ctx.FailWithMsg(ecode.UnknownErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟")
+ return
+ }
+
+ processParamsArr := make([]response.ProcessParams, 0, len(result.ParamsMap))
+ for k, v := range result.ParamsMap {
processParamsArr = append(processParamsArr, response.ProcessParams{
Key: k,
Value: v,
})
}
data := response.ProcessParamsResponse{
- Number: resp.Number,
+ Number: result.Number,
Params: processParamsArr,
}
- logx.Infof("TaskStart Notice GetProcessModel: %+v", resp)
+ logx.Infof("TaskStart Notice GetProcessModel: %+v", result)
ctx.OkWithDetailed(data)
}
--
Gitblit v1.8.0