From d93d2bc56ed06b3c060ff48f49591e8c5d779230 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 14 九月 2023 22:33:45 +0800
Subject: [PATCH] 通讯方式字段转换
---
api/v1/task.go | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index ca697e9..0552884 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -12,6 +12,7 @@
"apsClient/pkg/convertx"
"apsClient/pkg/ecode"
"apsClient/pkg/logx"
+ "apsClient/pkg/safe"
"apsClient/service"
"apsClient/service/plc_address"
"errors"
@@ -65,14 +66,10 @@
params.PageSize = 1
}
- taskDataList, count, code := service.NewTaskService().GetTask(params.Page, params.PageSize)
+ taskResponse, code := service.NewTaskService().GetTask(params.Page, params.PageSize)
if code != ecode.OK {
ctx.Fail(code)
return
- }
- taskResponse := &response.TaskResponse{
- Tasks: taskDataList,
- TaskCount: count,
}
ctx.OkWithDetailed(taskResponse)
}
@@ -120,6 +117,16 @@
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: processModel.Number,
Params: processParamsArr,
@@ -150,7 +157,7 @@
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)
@@ -215,6 +222,7 @@
if err != nil {
return err
}
+ procedure.Position = params.Position
err = taskService.UpdateOrderStatus(db, order.ID, model.OrderStatusProcessing)
if err != nil {
return err
@@ -243,7 +251,7 @@
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
--
Gitblit v1.8.0