From 4eeae3848f43be6e17113f67de351c51f435b57a Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 02 九月 2023 17:20:21 +0800
Subject: [PATCH] fix
---
api/v1/task.go | 169 ++++++++++++++++++++++++++++----------------------------
1 files changed, 84 insertions(+), 85 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index 88a677d..1729bc7 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -12,7 +12,6 @@
"apsClient/pkg/ecode"
"apsClient/pkg/logx"
"apsClient/pkg/plc"
- "apsClient/pkg/safe"
"apsClient/service"
"apsClient/service/plc_address"
"errors"
@@ -66,14 +65,14 @@
ctx.OkWithDetailed(taskData)
}
-// TaskStart
+// GetProcessParams
// @Tags Task
-// @Summary 浠诲姟寮�濮�
+// @Summary 浠诲姟寮�濮嬶紙鑾峰彇宸ヨ壓鍙傛暟锛�
// @Produce application/json
// @Param id path int true "宸ュ簭id"
// @Success 200 {object} contextx.Response{data=response.ProcessParamsResponse} "鎴愬姛"
// @Router /v1/task/start/{id} [get]
-func (slf *TaskApi) TaskStart(c *gin.Context) {
+func (slf *TaskApi) GetProcessParams(c *gin.Context) {
ctx, ok := contextx.NewContext(c, nil)
if !ok {
return
@@ -96,39 +95,24 @@
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}, &result, time.Second*3)
- if err != nil {
- logx.Errorf("TaskStart GetProcessModel error:%v", err.Error())
- ctx.FailWithMsg(ecode.UnknownErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟")
- return
- }
- if result.ParamsMap == nil {
- logx.Errorf("TaskStart GetProcessModel response miss process params:%v", result)
- ctx.FailWithMsg(ecode.UnknownErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟")
+ processModel, err := service.NewTaskService().GetProcessParams(procedure, order)
+ if err != nil || processModel == nil || processModel.ParamsMap == nil {
+ ctx.Fail(ecode.UnknownErr)
return
}
- processParamsArr := make([]response.ProcessParams, 0, len(result.ParamsMap))
- for k, v := range result.ParamsMap {
+ processParamsArr := make([]response.ProcessParams, 0, len(processModel.ParamsMap))
+ for k, v := range processModel.ParamsMap {
processParamsArr = append(processParamsArr, response.ProcessParams{
Key: k,
Value: v,
})
}
- data := response.ProcessParamsResponse{
- Number: result.Number,
+ resp := response.ProcessParamsResponse{
+ Number: processModel.Number,
Params: processParamsArr,
}
- logx.Infof("TaskStart Notice GetProcessModel: %+v", result)
- ctx.OkWithDetailed(data)
+ ctx.OkWithDetailed(resp)
}
// TaskFinish
@@ -149,7 +133,7 @@
return
}
id := convertx.Atoi(idx)
- _, code := service.NewTaskService().GetProcedureById(id)
+ procedure, code := service.NewTaskService().GetProcedureById(id)
if code != ecode.OK {
ctx.Fail(code)
return
@@ -160,17 +144,32 @@
ctx.Fail(ecode.UnknownErr)
return
}
+
+ msg := &common.MsgTaskStatusUpdate{
+ WorkOrderId: procedure.WorkOrderID,
+ ProcedureID: procedure.ProceduresInfo.ProcedureID,
+ DeviceId: procedure.ProceduresInfo.DeviceID,
+ IsProcessing: false,
+ IsFinish: true,
+ }
+
+ caller := nsq.NewCaller(fmt.Sprintf(constvar.NsqTopicTaskProcedureStatusUpdate, conf.Conf.NsqConf.NodeId), "")
+ err = caller.Send(msg)
+ if err != nil {
+ logx.Errorf("send task status update msg error:%v", err.Error())
+ }
+
ctx.Ok()
}
-// SendProcessParams
+// TaskStart
// @Tags Task
-// @Summary 涓嬪彂宸ヨ壓鍙傛暟
+// @Summary 涓嬪彂宸ヨ壓鍙傛暟锛堝紑濮嬩换鍔★級
// @Produce application/json
// @Param id path int true "宸ュ簭id"
// @Success 200 {object} contextx.Response{service.GetProcessModel} "鎴愬姛"
// @Router /v1/task/sendProcessParams/{id} [post]
-func (slf *TaskApi) SendProcessParams(c *gin.Context) {
+func (slf *TaskApi) TaskStart(c *gin.Context) {
ctx, ok := contextx.NewContext(c, nil)
if !ok {
return
@@ -197,23 +196,9 @@
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}, &result, time.Second*3)
- if err != nil {
- 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, "鏈幏鍙栧埌宸ヨ壓鍙傛暟")
+ processModel, err := service.NewTaskService().GetProcessParams(procedure, order)
+ if err != nil || processModel == nil || processModel.ParamsMap == nil {
+ ctx.Fail(ecode.UnknownErr)
return
}
@@ -230,68 +215,82 @@
})
if err != nil {
logx.Errorf("SendProcessParams update order and procedure status error:%v", err.Error())
- ctx.FailWithMsg(ecode.DBErr, "鏇存敼宸ュ崟鐘舵�佸け璐�")
+ ctx.FailWithMsg(ecode.NeedConfirmedErr, "鏇存敼宸ュ崟鐘舵�佸け璐�")
+ return
+ }
+ plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
+ if code != ecode.OK || plcConfig.Id == 0 {
+ ctx.FailWithMsg(ecode.NeedConfirmedErr, "璇峰厛閰嶇疆PLC")
+ return
+ }
+ plcConfig.MaxTryTimes = 2
+ err = SendParams(processModel.ParamsMap, plcConfig)
+ if err != nil {
+ logx.Errorf("SendProcessParams: %v", err.Error())
+ ctx.FailWithMsg(ecode.NeedConfirmedErr, "绯熺硶锛屽伐鑹轰笅鍙戝け璐ャ��")
+ return
+ }
+ if code != ecode.OK {
+ logx.Errorf("get plcConfig err: %v", err.Error())
+ return
+ }
+ plcConfig.CurrentTryTimes = 0
+ err = service.PlcWrite(plcConfig, constvar.PlcStartAddressTypeTotalNumber, order.Amount.IntPart())
+ if err != nil {
+ ctx.FailWithMsg(ecode.NeedConfirmedErr, "绯熺硶锛屽伐鑹轰笅鍙戝け璐ャ��")
return
}
- safe.Go(func() {
- err = SendParams(result.ParamsMap, 0)
- if err != nil {
- logx.Errorf("SendProcessParams: %v", err.Error())
- return
- }
- plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
- if code != ecode.OK {
- logx.Errorf("get plcConfig err: %v", err.Error())
- return
- }
- _ = service.PlcWrite(plcConfig, constvar.PlcStartAddressTypeTotalNumber, order.Amount.IntPart())
- })
+ msg := &common.MsgTaskStatusUpdate{
+ WorkOrderId: procedure.WorkOrderID,
+ ProcedureID: procedure.ProceduresInfo.ProcedureID,
+ DeviceId: procedure.ProceduresInfo.DeviceID,
+ IsProcessing: true,
+ IsFinish: false,
+ }
+
+ caller := nsq.NewCaller(fmt.Sprintf(constvar.NsqTopicTaskProcedureStatusUpdate, conf.Conf.NsqConf.NodeId), "")
+ err = caller.Send(msg)
+ if err != nil {
+ logx.Errorf("send task status update msg error:%v", err.Error())
+ }
+
ctx.Ok()
}
-func SendParams(paramsMap map[string]interface{}, tryTimes int) error {
+func SendParams(paramsMap map[string]interface{}, plcConfig *model.DevicePlc) error {
if len(paramsMap) == 0 {
return errors.New("empty params")
}
- if tryTimes > 2 {
- return errors.New("beyond max try time")
- }
- plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
- if code != ecode.OK {
- return errors.New("璇峰厛閰嶇疆PLC")
+ if plcConfig.CurrentTryTimes > plcConfig.MaxTryTimes {
+ return plcConfig.CurrentErr
}
conn, err := plc.GetModbusConnection(fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port))
if err != nil {
return errors.New(fmt.Sprintf("杩炴帴plc澶辫触: %v", err.Error()))
}
-
- logx.Info("----------------寮�濮嬩笅鍙戝伐鑹哄弬鏁�-----------------")
- var missNumbers int
+ if plcConfig.CurrentTryTimes == 0 {
+ logx.Info("----------------寮�濮嬩笅鍙戝伐鑹哄弬鏁�-----------------")
+ }
+ var failedNumbers int
for k, v := range paramsMap {
if address, ok := plc_address.Get(k); ok {
result, err := plc.WriteHoldingRegister(conn, address, v)
if err != nil {
- logx.Errorf("WriteHoldingRegister err:%v, address: %v, key: %v value: %v", err.Error(), address, k, v)
+ plcConfig.CurrentErr = err
+ failedNumbers++
+ logx.Errorf("plc write err:%v, address: %v, key: %v value: %v", err.Error(), address, k, v)
} else {
delete(paramsMap, k)
- logx.Infof("WriteHoldingRegister ok: key: %v, value: %v, result: %v", k, v, result)
+ logx.Infof("plc write ok: key: %v, value: %v, result: %v", k, v, result)
}
} else {
logx.Errorf("miss param address, k:%v, v:%v", k, v)
- missNumbers++
}
}
- if missNumbers >= 1 {
- caller := nsq.NewCaller(fmt.Sprintf(constvar.NsqTopicGetPlcAddress, conf.Conf.NsqConf.NodeId), fmt.Sprintf(constvar.NsqTopicSendPlcAddress, conf.Conf.NsqConf.NodeId))
- var addressResult common.ResponsePlcAddress
- err := caller.Call(common.RequestPlcAddress{DeviceId: conf.Conf.System.DeviceId}, &addressResult, time.Second*2)
- if err != nil {
- logx.Infof("SendParams2 err: %v", err.Error())
- return err
- }
- tryTimes++
- return SendParams(paramsMap, tryTimes)
+ if failedNumbers >= 1 { //鍐欏叆plc澶辫触, 閲嶈瘯
+ plcConfig.CurrentTryTimes++
+ return SendParams(paramsMap, plcConfig)
}
logx.Info("----------------涓嬪彂宸ヨ壓鍙傛暟瀹屾瘯-----------------")
return nil
--
Gitblit v1.8.0