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 | 74 +++++++++++++++++++++---------------
1 files changed, 43 insertions(+), 31 deletions(-)
diff --git a/api/v1/task.go b/api/v1/task.go
index 74287d5..0552884 100644
--- a/api/v1/task.go
+++ b/api/v1/task.go
@@ -5,13 +5,14 @@
"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"
"errors"
@@ -49,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
@@ -108,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,
@@ -138,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)
@@ -166,22 +185,17 @@
// @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]
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)
taskService := service.NewTaskService()
- procedure, code := taskService.GetProcedureById(id)
+ procedure, code := taskService.GetProcedureById(params.ProcedureId)
if code != ecode.OK {
ctx.Fail(code)
return
@@ -204,10 +218,11 @@
}
err = model.WithTransaction(func(db *gorm.DB) error {
- err = taskService.UpdateProcedureStatus(db, id, model.ProcedureStatusProcessing)
+ err = taskService.UpdateProcedureStatusAndPosition(db, params.ProcedureId, model.ProcedureStatusProcessing, params.Position)
if err != nil {
return err
}
+ procedure.Position = params.Position
err = taskService.UpdateOrderStatus(db, order.ID, model.OrderStatusProcessing)
if err != nil {
return err
@@ -236,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
@@ -266,27 +281,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