From 302c591ca77dd4fb2b6e373d9912b91ee88f89f5 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 23 八月 2023 12:58:56 +0800
Subject: [PATCH] 下发工艺参数时使用nsq获取工艺参数
---
api/v1/task.go | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index e817874..0c77d46 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -186,18 +186,23 @@
return
}
- params := service.GetProcessModelParams{
+ 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("SendProcessModel GetProcessModel err: %v", err.Error())
- ctx.Fail(ecode.UnknownErr)
+ logx.Errorf("SendProcessParams GetProcessModel error:%v", err.Error())
+ ctx.FailWithMsg(ecode.UnknownErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟")
+ return
+ }
+ if result.ParamsMap == nil {
+ logx.Errorf("SendProcessParams GetProcessModel response miss process params:%v", result)
+ ctx.FailWithMsg(ecode.UnknownErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟")
return
}
@@ -216,7 +221,7 @@
//}
safe.Go(func() {
- err = SendParams2(resp.ParamsMap, 0)
+ err = SendParams2(result.ParamsMap, 0)
if err != nil {
logx.Errorf("SendProcessParams: %v", err.Error())
return
--
Gitblit v1.8.0