From 5d91129464fd4e8a0bfb5c1c11a11710197e2e76 Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期日, 08 十月 2023 11:57:14 +0800 Subject: [PATCH] 去掉无用参数 --- service/task.go | 3 +-- docs/swagger.yaml | 2 -- docs/docs.go | 3 --- model/request/task.go | 3 +-- api/v1/task.go | 8 +++----- docs/swagger.json | 3 --- 6 files changed, 5 insertions(+), 17 deletions(-) diff --git a/api/v1/task.go b/api/v1/task.go index 44aa2fb..ac472cb 100644 --- a/api/v1/task.go +++ b/api/v1/task.go @@ -284,11 +284,10 @@ } err = model.WithTransaction(func(db *gorm.DB) error { - err = taskService.UpdateProcedureStatusAndChannel(db, params.ProcedureId, model.ProcedureStatusProcessing, params.Channel) + err = taskService.UpdateProcedureStatusAndChannel(db, params.ProcedureId, model.ProcedureStatusProcessing, procedure.Channel) if err != nil { return err } - procedure.Channel = params.Channel err = taskService.UpdateOrderStatus(db, order.ID, model.OrderStatusProcessing) if err != nil { return err @@ -310,11 +309,10 @@ if err != nil { logx.Errorf("SendProcessParams: %v", err.Error()) err = model.WithTransaction(func(db *gorm.DB) error { - err = taskService.UpdateProcedureStatusAndChannel(db, params.ProcedureId, model.ProcedureStatusWaitProcess, params.Channel) + err = taskService.UpdateProcedureStatusAndChannel(db, params.ProcedureId, model.ProcedureStatusWaitProcess, procedure.Channel) if err != nil { return err } - procedure.Channel = params.Channel err = taskService.UpdateOrderStatus(db, order.ID, model.OrderStatusWaitProcess) if err != nil { return err @@ -325,7 +323,7 @@ return } plcConfig.CurrentTryTimes = 0 - err = service.PlcWrite(plcConfig, constvar.PlcStartAddressTypeTotalNumber, params.Channel, order.Amount.IntPart()) + err = service.PlcWrite(plcConfig, constvar.PlcStartAddressTypeTotalNumber, procedure.Channel, order.Amount.IntPart()) if err != nil { ctx.FailWithMsg(ecode.NeedConfirmedErr, "PLC璇锋眰澶辫触锛岃妫�鏌LC閰嶇疆") return diff --git a/docs/docs.go b/docs/docs.go index aea2cf6..76bb333 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -1093,9 +1093,6 @@ "procedureId" ], "properties": { - "channel": { - "type": "integer" - }, "procedureId": { "type": "integer" } diff --git a/docs/swagger.json b/docs/swagger.json index ba7deaf..52ae3f8 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -1081,9 +1081,6 @@ "procedureId" ], "properties": { - "channel": { - "type": "integer" - }, "procedureId": { "type": "integer" } diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 80c87ea..42c23d7 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -301,8 +301,6 @@ type: object request.SendProcessParams: properties: - channel: - type: integer procedureId: type: integer required: diff --git a/model/request/task.go b/model/request/task.go index b1054ea..99b71c2 100644 --- a/model/request/task.go +++ b/model/request/task.go @@ -18,8 +18,7 @@ } type SendProcessParams struct { - ProcedureId int `json:"procedureId" binding:"required"` - Channel int32 `json:"channel"` + ProcedureId int `json:"procedureId" binding:"required"` } type GetProductProgress struct { diff --git a/service/task.go b/service/task.go index f9413cc..885a66d 100644 --- a/service/task.go +++ b/service/task.go @@ -136,8 +136,7 @@ ProgressCacheUnset(channel) } return model.NewProceduresSearch(db).SetId(id).UpdateByMap(map[string]interface{}{ - "status": status, - "channel": channel, + "status": status, }) } -- Gitblit v1.8.0