去掉无用参数

zhangqian

2023-10-08 5d91129464fd4e8a0bfb5c1c11a11710197e2e76

去掉无用参数

 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请求失败，请检查PLC配置")
        return

 docs/docs.go

@@ -1093,9 +1093,6 @@
                "procedureId"
            ],
            "properties": {
                "channel": {
                    "type": "integer"
                },
                "procedureId": {
                    "type": "integer"
                }

 docs/swagger.json

@@ -1081,9 +1081,6 @@
                "procedureId"
            ],
            "properties": {
                "channel": {
                    "type": "integer"
                },
                "procedureId": {
                    "type": "integer"
                }

 docs/swagger.yaml

@@ -301,8 +301,6 @@
    type: object
  request.SendProcessParams:
    properties:
      channel:
        type: integer
      procedureId:
        type: integer
    required:

 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 {

 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,
    })
}