From b555874608be2e4bb40cceba60b497c04caef842 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 12 九月 2023 14:17:51 +0800
Subject: [PATCH] 三菱协议更改
---
api/v1/task.go | 78 +++++++++++++++++++++++++++------------
1 files changed, 54 insertions(+), 24 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index 0a364f5..7fb3b50 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -1,14 +1,16 @@
package v1
import (
+ "apsClient/conf"
"apsClient/constvar"
"apsClient/model"
+ "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"
@@ -32,7 +34,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
@@ -130,7 +132,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
@@ -141,6 +143,21 @@
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()
}
@@ -162,12 +179,13 @@
return
}
id := convertx.Atoi(idx)
- procedure, code := service.NewTaskService().GetProcedureById(id)
+ taskService := service.NewTaskService()
+ procedure, code := taskService.GetProcedureById(id)
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
@@ -178,22 +196,22 @@
return
}
- processModel, err := service.NewTaskService().GetProcessParams(procedure, order)
+ 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.UpdateProcedureStatus(db, id, model.ProcedureStatusProcessing)
if err != nil {
return err
}
- err = service.NewTaskService().UpdateOrderStatus(db, order.ID, model.OrderStatusProcessing)
+ err = taskService.UpdateOrderStatus(db, order.ID, model.OrderStatusProcessing)
if err != nil {
return err
}
- return nil
+ return service.NewProgressService().AddProgress(db, procedure, order)
})
if err != nil {
logx.Errorf("SendProcessParams update order and procedure status error:%v", err.Error())
@@ -222,6 +240,21 @@
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()
}
@@ -232,27 +265,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