From d457b47a702857cdefb56a0a518201ba8ad2505f Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 16 九月 2023 19:07:01 +0800
Subject: [PATCH] apache plc4x短连接
---
api/v1/task.go | 203 +++++++++++++++++++++++++-------------------------
1 files changed, 102 insertions(+), 101 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index 377ba71..bbb328d 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -5,16 +5,16 @@
"apsClient/constvar"
"apsClient/model"
"apsClient/model/common"
+ "apsClient/model/request"
"apsClient/model/response"
"apsClient/nsq"
"apsClient/pkg/contextx"
"apsClient/pkg/convertx"
"apsClient/pkg/ecode"
"apsClient/pkg/logx"
- "apsClient/pkg/plc"
+ "apsClient/pkg/safe"
"apsClient/service"
"apsClient/service/plc_address"
- "encoding/json"
"errors"
"fmt"
"github.com/gin-gonic/gin"
@@ -36,7 +36,7 @@
return
}
var resp response.TaskCountdown
- workOrder, err := service.NewTaskService().GetCurrentTask()
+ workOrder, err := service.NewTaskService().GetNextTask()
if err == nil {
seconds := workOrder.StartTime - time.Now().Unix()
resp.CountDownHour = seconds / 3600
@@ -50,20 +50,28 @@
// @Tags Task
// @Summary 鑾峰彇浠诲姟
// @Produce application/json
+// @Param object query request.TaskList true "鏌ヨ鍙傛暟"
// @Success 200 {object} contextx.Response{data=response.TaskData} "鎴愬姛"
// @Router /v1/task/get [get]
func (slf *TaskApi) TaskGet(c *gin.Context) {
- ctx, ok := contextx.NewContext(c, nil)
+ var params request.TaskList
+ ctx, ok := contextx.NewContext(c, ¶ms)
if !ok {
return
}
+ if params.Page <= 0 {
+ params.Page = 1
+ }
+ if params.PageSize <= 0 {
+ params.PageSize = 1
+ }
- taskData, code := service.NewTaskService().GetTask()
+ taskResponse, code := service.NewTaskService().GetTask(params.Page, params.PageSize)
if code != ecode.OK {
ctx.Fail(code)
return
}
- ctx.OkWithDetailed(taskData)
+ ctx.OkWithDetailed(taskResponse)
}
// GetProcessParams
@@ -96,60 +104,31 @@
return
}
- paramsMap := make(map[string]interface{})
- var paramsNumber string
- data, err := model.NewProcessModelSearch().
- SetWorkOrder(procedure.WorkOrderID).
- SetDevice(procedure.ProceduresInfo.DeviceName).
- SetOrderId(procedure.OrderID).
- SetProcedure(procedure.ProceduresInfo.ProcedureName).
- SetProduct(order.ProductName).
- SetOrder("id desc").First()
- if err == nil {
- err = json.Unmarshal([]byte(data.Params), &data.ParamsMap)
- paramsMap = data.ParamsMap
- paramsNumber = data.Number
- if err != nil {
- logx.Errorf("process model json.Unmarshal:%v", err)
- ctx.FailWithMsg(ecode.UnknownErr, "鏈幏鍙栧埌宸ヨ壓鍙傛暟")
- return
- }
- } else if err == gorm.ErrRecordNotFound { //濡備綍鏁版嵁搴撴病鏈変粠浜戠鑾峰彇
- 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, "鏈幏鍙栧埌宸ヨ壓鍙傛暟")
- return
- }
- paramsMap = result.ParamsMap
- paramsNumber = result.Number
- } else {
- logx.Errorf("TaskStart GetProcessModel err:%v", err)
- 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(paramsMap))
- for k, v := range data.ParamsMap {
+ processParamsArr := make([]response.ProcessParams, 0, len(processModel.ParamsMap))
+ for k, v := range processModel.ParamsMap {
processParamsArr = append(processParamsArr, response.ProcessParams{
Key: k,
Value: v,
})
}
+
+ safe.Go(func() {
+ 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*3)
+ if err != nil {
+ logx.Infof("get plc address err: %v", err.Error())
+ }
+ })
+
resp := response.ProcessParamsResponse{
- Number: paramsNumber,
+ Number: processModel.Number,
Params: processParamsArr,
}
ctx.OkWithDetailed(resp)
@@ -173,17 +152,32 @@
return
}
id := convertx.Atoi(idx)
- _, code := service.NewTaskService().GetProcedureById(id)
+ procedure, code := service.NewTaskService().GetProcedureById(id)
if code != ecode.OK {
ctx.Fail(code)
return
}
- err := service.NewTaskService().UpdateProcedureStatus(nil, id, model.ProcedureStatusFinished)
+ err := service.NewTaskService().UpdateProcedureStatus(nil, id, model.ProcedureStatusFinished, procedure.Position)
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()
}
@@ -191,26 +185,22 @@
// @Tags Task
// @Summary 涓嬪彂宸ヨ壓鍙傛暟锛堝紑濮嬩换鍔★級
// @Produce application/json
-// @Param id path int true "宸ュ簭id"
+// @Param object body request.SendProcessParams true "鏌ヨ鍙傛暟"
// @Success 200 {object} contextx.Response{service.GetProcessModel} "鎴愬姛"
-// @Router /v1/task/sendProcessParams/{id} [post]
+// @Router /v1/task/sendProcessParams [post]
func (slf *TaskApi) TaskStart(c *gin.Context) {
- ctx, ok := contextx.NewContext(c, nil)
+ var params request.SendProcessParams
+ ctx, ok := contextx.NewContext(c, ¶ms)
if !ok {
return
}
- idx := c.Param("id")
- if idx == "" {
- ctx.Fail(ecode.ParamsErr)
- return
- }
- id := convertx.Atoi(idx)
- procedure, code := service.NewTaskService().GetProcedureById(id)
+ taskService := service.NewTaskService()
+ procedure, code := taskService.GetProcedureById(params.ProcedureId)
if code != ecode.OK {
ctx.Fail(code)
return
}
- order, err := service.NewTaskService().GetOrderByWorkOrderId(procedure.WorkOrderID)
+ order, err := taskService.GetOrderByWorkOrderId(procedure.WorkOrderID)
if err != nil {
ctx.Fail(ecode.UnknownErr)
return
@@ -221,36 +211,23 @@
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 := taskService.GetProcessParams(procedure, order)
+ if err != nil || processModel == nil || processModel.ParamsMap == nil {
+ ctx.Fail(ecode.UnknownErr)
return
}
err = model.WithTransaction(func(db *gorm.DB) error {
- err = service.NewTaskService().UpdateProcedureStatus(db, id, model.ProcedureStatusProcessing)
+ err = taskService.UpdateProcedureStatusAndPosition(db, params.ProcedureId, model.ProcedureStatusProcessing, params.Position)
if err != nil {
return err
}
- err = service.NewTaskService().UpdateOrderStatus(db, order.ID, model.OrderStatusProcessing)
+ procedure.Position = params.Position
+ err = taskService.UpdateOrderStatus(db, order.ID, model.OrderStatusProcessing)
if err != nil {
return err
}
- return nil
+ return service.NewProgressService().Upsert(db, procedure, order)
})
if err != nil {
logx.Errorf("SendProcessParams update order and procedure status error:%v", err.Error())
@@ -263,9 +240,21 @@
return
}
plcConfig.MaxTryTimes = 2
- err = SendParams(result.ParamsMap, plcConfig)
+ err = SendParams(processModel.ParamsMap, plcConfig)
if err != nil {
logx.Errorf("SendProcessParams: %v", err.Error())
+ err = model.WithTransaction(func(db *gorm.DB) error {
+ err = taskService.UpdateProcedureStatusAndPosition(db, params.ProcedureId, model.ProcedureStatusWaitProcess, params.Position)
+ if err != nil {
+ return err
+ }
+ procedure.Position = params.Position
+ err = taskService.UpdateOrderStatus(db, order.ID, model.OrderStatusWaitProcess)
+ if err != nil {
+ return err
+ }
+ return nil
+ })
ctx.FailWithMsg(ecode.NeedConfirmedErr, "绯熺硶锛屽伐鑹轰笅鍙戝け璐ャ��")
return
}
@@ -274,11 +263,26 @@
return
}
plcConfig.CurrentTryTimes = 0
- err = service.PlcWrite(plcConfig, constvar.PlcStartAddressTypeTotalNumber, order.Amount.IntPart())
+ err = service.PlcWrite(plcConfig, constvar.PlcStartAddressTypeTotalNumber, params.Position, order.Amount.IntPart())
if err != nil {
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()
}
@@ -289,27 +293,24 @@
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()))
- }
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 {
- 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 {
+ address, ok := plc_address.Get(k)
+ if !ok {
logx.Errorf("miss param address, k:%v, v:%v", k, v)
+ continue
+ }
+ err := service.PlcWriteDirect(plcConfig, 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", k, v)
}
}
if failedNumbers >= 1 { //鍐欏叆plc澶辫触, 閲嶈瘯
--
Gitblit v1.8.0