From 74c155ba2112a6e9f3be730e1656a157d2f6cefc Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 02 九月 2023 18:05:42 +0800
Subject: [PATCH] update
---
api/v1/task.go | 287 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 208 insertions(+), 79 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index c2e6b8c..1729bc7 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -1,19 +1,49 @@
package v1
import (
+ "apsClient/conf"
+ "apsClient/constvar"
"apsClient/model"
- _ "apsClient/model/response"
+ "apsClient/model/common"
+ "apsClient/model/response"
+ "apsClient/nsq"
"apsClient/pkg/contextx"
"apsClient/pkg/convertx"
"apsClient/pkg/ecode"
"apsClient/pkg/logx"
+ "apsClient/pkg/plc"
"apsClient/service"
+ "apsClient/service/plc_address"
+ "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
@@ -35,13 +65,110 @@
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) GetProcessParams(c *gin.Context) {
+ ctx, ok := contextx.NewContext(c, nil)
+ if !ok {
+ return
+ }
+ idx := c.Param("id")
+ if idx == "" {
+ ctx.Fail(ecode.ParamsErr)
+ return
+ }
+ id := convertx.Atoi(idx)
+ procedure, code := service.NewTaskService().GetProcedureById(id)
+ if code != ecode.OK {
+ ctx.Fail(code)
+ return
+ }
+
+ order, err := service.NewTaskService().GetOrderByWorkOrderId(procedure.WorkOrderID)
+ if err != nil {
+ ctx.Fail(ecode.UnknownErr)
+ return
+ }
+
+ 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(processModel.ParamsMap))
+ for k, v := range processModel.ParamsMap {
+ processParamsArr = append(processParamsArr, response.ProcessParams{
+ Key: k,
+ Value: v,
+ })
+ }
+ resp := response.ProcessParamsResponse{
+ Number: processModel.Number,
+ Params: processParamsArr,
+ }
+ ctx.OkWithDetailed(resp)
+}
+
+// TaskFinish
+// @Tags Task
+// @Summary 浠诲姟缁撴潫
// @Produce application/json
// @Param id path int true "宸ュ簭id"
// @Success 200 {object} contextx.Response{service.GetProcessModel} "鎴愬姛"
-// @Router /v1/task/start/{id} [get]
+// @Router /v1/task/finish/{id} [put]
+func (slf *TaskApi) TaskFinish(c *gin.Context) {
+ ctx, ok := contextx.NewContext(c, nil)
+ if !ok {
+ return
+ }
+ idx := c.Param("id")
+ if idx == "" {
+ ctx.Fail(ecode.ParamsErr)
+ return
+ }
+ id := convertx.Atoi(idx)
+ procedure, code := service.NewTaskService().GetProcedureById(id)
+ if code != ecode.OK {
+ ctx.Fail(code)
+ return
+ }
+ err := service.NewTaskService().UpdateProcedureStatus(nil, id, model.ProcedureStatusFinished)
+ if err != nil {
+ logx.Errorf("UpdateProcedureStatus err: %v", err.Error())
+ 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()
+}
+
+// TaskStart
+// @Tags Task
+// @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) TaskStart(c *gin.Context) {
ctx, ok := contextx.NewContext(c, nil)
if !ok {
@@ -64,105 +191,107 @@
return
}
- params := service.GetProcessModelParams{
- WorkOrder: procedure.WorkOrderID,
- OrderId: procedure.OrderID,
- Product: order.ProductName,
- Procedure: procedure.ProceduresInfo.ProcedureName,
- Device: procedure.ProceduresInfo.DeviceName,
+ if procedure.Status == model.ProcedureStatusProcessing {
+ ctx.FailWithMsg(ecode.ParamsErr, "璇ュ伐搴忓凡寮�濮嬬敓浜�")
+ return
}
- resp, err := service.ProcessModel{}.GetProcessModel(params)
-
- if err != nil {
- logx.Errorf("TaskStart Notice GetProcessModel error: %v", err.Error())
+ processModel, err := service.NewTaskService().GetProcessParams(procedure, order)
+ if err != nil || processModel == nil || processModel.ParamsMap == nil {
ctx.Fail(ecode.UnknownErr)
return
}
- logx.Infof("TaskStart Notice GetProcessModel: %+v", resp)
- ctx.OkWithDetailed(resp)
-}
-// TaskFinish
-// @Tags Task
-// @Summary 浠诲姟缁撴潫
-// @Produce application/json
-// @Param id path int true "宸ュ簭id"
-// @Success 200 {object} contextx.Response{service.GetProcessModel} "鎴愬姛"
-// @Router /v1/task/finish/{id} [put]
-func (slf *TaskApi) TaskFinish(c *gin.Context) {
- ctx, ok := contextx.NewContext(c, nil)
- if !ok {
+ 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.NeedConfirmedErr, "鏇存敼宸ュ崟鐘舵�佸け璐�")
return
}
- idx := c.Param("id")
- if idx == "" {
- ctx.Fail(ecode.ParamsErr)
+ plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
+ if code != ecode.OK || plcConfig.Id == 0 {
+ ctx.FailWithMsg(ecode.NeedConfirmedErr, "璇峰厛閰嶇疆PLC")
return
}
- id := convertx.Atoi(idx)
- _, code := service.NewTaskService().GetProcedureById(id)
+ 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 {
- ctx.Fail(code)
+ logx.Errorf("get plcConfig err: %v", err.Error())
return
}
- err := service.NewTaskService().UpdateProcedureStatus(id, model.ProcedureStatusFinished)
+ plcConfig.CurrentTryTimes = 0
+ err = service.PlcWrite(plcConfig, constvar.PlcStartAddressTypeTotalNumber, order.Amount.IntPart())
if err != nil {
- logx.Errorf("UpdateProcedureStatus err: %v", err.Error())
- ctx.Fail(ecode.UnknownErr)
+ ctx.FailWithMsg(ecode.NeedConfirmedErr, "绯熺硶锛屽伐鑹轰笅鍙戝け璐ャ��")
return
}
+
+ 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()
}
-// SendProcessParams
-// @Tags Task
-// @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) {
- ctx, ok := contextx.NewContext(c, nil)
- if !ok {
- return
+func SendParams(paramsMap map[string]interface{}, plcConfig *model.DevicePlc) error {
+ if len(paramsMap) == 0 {
+ return errors.New("empty params")
}
- idx := c.Param("id")
- if idx == "" {
- ctx.Fail(ecode.ParamsErr)
- return
+ if plcConfig.CurrentTryTimes > plcConfig.MaxTryTimes {
+ return plcConfig.CurrentErr
}
- id := convertx.Atoi(idx)
- procedure, code := service.NewTaskService().GetProcedureById(id)
- if code != ecode.OK {
- ctx.Fail(code)
- return
- }
- order, err := service.NewTaskService().GetOrderByWorkOrderId(procedure.WorkOrderID)
+ conn, err := plc.GetModbusConnection(fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port))
if err != nil {
- ctx.Fail(ecode.UnknownErr)
- return
+ return errors.New(fmt.Sprintf("杩炴帴plc澶辫触: %v", err.Error()))
}
-
- params := service.GetProcessModelParams{
- WorkOrder: "",
- OrderId: procedure.OrderID,
- Product: order.ProductName,
- Procedure: procedure.ProceduresInfo.ProcedureName,
- Device: procedure.ProceduresInfo.DeviceID,
+ if plcConfig.CurrentTryTimes == 0 {
+ logx.Info("----------------寮�濮嬩笅鍙戝伐鑹哄弬鏁�-----------------")
}
-
- resp, err := service.ProcessModel{}.GetProcessModel(params)
- if err != nil {
- logx.Errorf("SendProcessModel GetProcessModel err: %v", err.Error())
- ctx.Fail(ecode.UnknownErr)
- return
+ 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 {
+ 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("plc write ok: key: %v, value: %v, result: %v", k, v, result)
+ }
+ } else {
+ logx.Errorf("miss param address, k:%v, v:%v", k, v)
+ }
}
- fmt.Println("----------------寮�濮嬩笅鍙戝伐鑹哄弬鏁�-----------------")
- for k, v := range resp.ParamsMap {
- fmt.Println(fmt.Sprintf("%v : %v", k, v))
- time.Sleep(time.Millisecond * 300)
+ if failedNumbers >= 1 { //鍐欏叆plc澶辫触, 閲嶈瘯
+ plcConfig.CurrentTryTimes++
+ return SendParams(paramsMap, plcConfig)
}
- fmt.Println("----------------涓嬪彂宸ヨ壓鍙傛暟瀹屾瘯-----------------")
- ctx.Ok()
+ logx.Info("----------------涓嬪彂宸ヨ壓鍙傛暟瀹屾瘯-----------------")
+ return nil
}
--
Gitblit v1.8.0