From adc5f83146f898cd2743313e619fff47141799f7 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 28 八月 2023 10:46:25 +0800
Subject: [PATCH] 去掉获取工艺参数重试，增加plc写入失败重试
---
api/v1/task.go | 159 +++++++++++++++++++++++------------------------------
1 files changed, 69 insertions(+), 90 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index 0c77d46..83c199e 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -18,10 +18,33 @@
"errors"
"fmt"
"github.com/gin-gonic/gin"
+ "gorm.io/gorm"
"time"
)
type TaskApi struct{}
+
+// TaskCountdown
+// @Tags Task
+// @Summary 鏂颁换鍔″�掕鏃�
+// @Produce application/json
+// @Success 200 {object} contextx.Response{data=response.TaskCountdown} "鎴愬姛"
+// @Router /v1/task/countdown [get]
+func (slf *TaskApi) TaskCountdown(c *gin.Context) {
+ ctx, ok := contextx.NewContext(c, nil)
+ if !ok {
+ return
+ }
+ var resp response.TaskCountdown
+ workOrder, err := service.NewTaskService().GetCurrentTask()
+ if err == nil {
+ seconds := workOrder.StartTime - time.Now().Unix()
+ resp.CountDownHour = seconds / 3600
+ resp.CountDownMinute = seconds % 3600 / 60
+ resp.ShowCountDown = true
+ }
+ ctx.OkWithDetailed(resp)
+}
// TaskGet
// @Tags Task
@@ -43,14 +66,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
@@ -66,29 +89,12 @@
ctx.Fail(code)
return
}
- if procedure.Status != model.ProcedureStatusUnFinished {
- ctx.FailWithMsg(ecode.ParamsErr, "璇ュ伐搴忓凡缁撴潫")
- return
- }
order, err := service.NewTaskService().GetOrderByWorkOrderId(procedure.WorkOrderID)
if err != nil {
ctx.Fail(ecode.UnknownErr)
return
}
- //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
@@ -98,7 +104,7 @@
OrderId: procedure.OrderID,
Product: order.ProductName,
Procedure: procedure.ProceduresInfo.ProcedureName,
- Device: procedure.ProceduresInfo.DeviceName}, &result, time.Second*5)
+ Device: procedure.ProceduresInfo.DeviceName}, &result, time.Second*3)
if err != nil {
logx.Errorf("TaskStart GetProcessModel error:%v", err.Error())
ctx.FailWithMsg(ecode.UnknownErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟")
@@ -148,7 +154,7 @@
ctx.Fail(code)
return
}
- err := service.NewTaskService().UpdateProcedureStatus(id, model.ProcedureStatusFinished)
+ err := service.NewTaskService().UpdateProcedureStatus(nil, id, model.ProcedureStatusFinished)
if err != nil {
logx.Errorf("UpdateProcedureStatus err: %v", err.Error())
ctx.Fail(ecode.UnknownErr)
@@ -157,14 +163,14 @@
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
@@ -186,6 +192,11 @@
return
}
+ if procedure.Status == model.ProcedureStatusProcessing {
+ ctx.FailWithMsg(ecode.ParamsErr, "璇ュ伐搴忓凡寮�濮嬬敓浜�")
+ return
+ }
+
caller := nsq.NewCaller(fmt.Sprintf(constvar.NsqTopicProcessParamsRequest, conf.Conf.NsqConf.NodeId), fmt.Sprintf(constvar.NsqTopicProcessParamsResponse, conf.Conf.NsqConf.NodeId))
var result common.ResponseProcessParams
@@ -194,7 +205,7 @@
OrderId: procedure.OrderID,
Product: order.ProductName,
Procedure: procedure.ProceduresInfo.ProcedureName,
- Device: procedure.ProceduresInfo.DeviceName}, &result, time.Second*5)
+ Device: procedure.ProceduresInfo.DeviceName}, &result, time.Second*3)
if err != nil {
logx.Errorf("SendProcessParams GetProcessModel error:%v", err.Error())
ctx.FailWithMsg(ecode.UnknownErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟")
@@ -206,65 +217,40 @@
return
}
- //fmt.Println("----------------寮�濮嬩笅鍙戝伐鑹哄弬鏁�-----------------")
- //for k, v := range resp.ParamsMap {
- // fmt.Println(fmt.Sprintf("%v : %v", k, v))
- // time.Sleep(time.Millisecond * 300)
- //}
- //fmt.Println("----------------涓嬪彂宸ヨ壓鍙傛暟瀹屾瘯-----------------")
-
- //err = SendParams(resp.ParamsMap)
- //if err != nil {
- // logx.Errorf("SendProcessParams: %v", err.Error())
- // ctx.Fail(ecode.UnknownErr)
- // return
- //}
+ err = model.WithTransaction(func(db *gorm.DB) error {
+ err = service.NewTaskService().UpdateProcedureStatus(db, id, model.ProcedureStatusProcessing)
+ if err != nil {
+ return err
+ }
+ err = service.NewTaskService().UpdateOrderStatus(db, order.ID, model.OrderStatusProcessing)
+ if err != nil {
+ return err
+ }
+ return nil
+ })
+ if err != nil {
+ logx.Errorf("SendProcessParams update order and procedure status error:%v", err.Error())
+ ctx.FailWithMsg(ecode.DBErr, "鏇存敼宸ュ崟鐘舵�佸け璐�")
+ return
+ }
safe.Go(func() {
- err = SendParams2(result.ParamsMap, 0)
+ 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())
})
ctx.Ok()
}
-func SendParams(paramsMap map[string]interface{}) error {
- if len(paramsMap) == 0 {
- return errors.New("empty params")
- }
- plcAddressMap := make(map[string]*int, len(conf.Conf.PLCAddresses))
- for _, item := range conf.Conf.PLCAddresses {
- plcAddressMap[item.FieldName] = &item.Address
- }
-
- plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
- if code != ecode.OK {
- return errors.New("璇峰厛閰嶇疆PLC")
- }
- conn, err := plc.NewModbusConnection(fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port))
- if err != nil {
- return errors.New(fmt.Sprintf("杩炴帴plc澶辫触: %v", err.Error()))
- }
- defer conn.Close()
-
- logx.Info("----------------寮�濮嬩笅鍙戝伐鑹哄弬鏁�-----------------")
- for k, v := range paramsMap {
- if plcAddressMap[k] != nil {
- result, err := plc.WriteHoldingRegister(conn, *plcAddressMap[k], v)
- if err != nil {
- logx.Errorf("WriteHoldingRegister err:%v, address: %v, key: %v value: %v", err.Error(), *plcAddressMap[k], k, v)
- } else {
- logx.Infof("WriteHoldingRegister ok: key: %v, value: %v, result: %v", k, v, result)
- }
- }
- }
- logx.Info("----------------涓嬪彂宸ヨ壓鍙傛暟瀹屾瘯-----------------")
- return nil
-}
-
-func SendParams2(paramsMap map[string]interface{}, tryTimes int) error {
+func SendParams(paramsMap map[string]interface{}, tryTimes int) error {
if len(paramsMap) == 0 {
return errors.New("empty params")
}
@@ -275,37 +261,30 @@
if code != ecode.OK {
return errors.New("璇峰厛閰嶇疆PLC")
}
- conn, err := plc.NewModbusConnection(fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port))
+ conn, err := plc.GetModbusConnection(fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port))
if err != nil {
return errors.New(fmt.Sprintf("杩炴帴plc澶辫触: %v", err.Error()))
}
- defer conn.Close()
logx.Info("----------------寮�濮嬩笅鍙戝伐鑹哄弬鏁�-----------------")
- var missNumbers int
+ 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)
+ 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 {
- missNumbers++
+ logx.Errorf("miss param address, k:%v, v:%v", k, v)
}
}
- 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
- }
+ if failedNumbers >= 1 { //鍐欏叆plc澶辫触, 閲嶈瘯
tryTimes++
- return SendParams2(paramsMap, tryTimes)
+ return SendParams(paramsMap, tryTimes)
}
logx.Info("----------------涓嬪彂宸ヨ壓鍙傛暟瀹屾瘯-----------------")
return nil
--
Gitblit v1.8.0