从云端请求工艺参数，加入deviceId字段用于消息过滤

zhangqian

2023-09-02 74f8cd07a39795656573d4e4bb2fe85a6dadbb8c

 docs/swagger.yaml

@@ -36,6 +36,10 @@
        items:
          $ref: '#/definitions/common.ProcedureMaterial'
        type: array
      nextProcedureId:
        type: string
      nextProcedureName:
        type: string
      outputMaterials:
        description: 输出物料列表
        items:
@@ -55,6 +59,30 @@
          $ref: '#/definitions/common.ProcedureWorker'
        type: array
    type: object
  constvar.PlcMethod:
    enum:
    - modbusTCP
    - serial
    type: string
    x-enum-varnames:
    - PlcMethodModbusTCP
    - PlcMethodSerial
  constvar.PlcStartAddressType:
    enum:
    - 1
    - 2
    type: integer
    x-enum-varnames:
    - PlcStartAddressTypeFinishNumber
    - PlcStartAddressTypeTotalNumber
  constvar.PlcStartAddressValueType:
    enum:
    - string
    - int
    type: string
    x-enum-varnames:
    - PlcStartAddressValueTypeString
    - PlcStartAddressValueTypeInt
  contextx.Response:
    properties:
      code:
@@ -62,6 +90,52 @@
      data: {}
      msg:
        type: string
    type: object
  model.DevicePlc:
    properties:
      address:
        description: |-
          PortName   string `gorm:"type:varchar(191);comment:端口名称" json:"portName"`
          Frequency  int    `gorm:"type:int(11);comment:数据更新频率 0-实时更新 1-1次/秒" json:"frequency"`
        type: string
      baudRate:
        description: 串口波特率， method = serial时 用
        type: integer
      brand:
        type: string
      details:
        items:
          $ref: '#/definitions/model.DevicePlcAddress'
        type: array
      id:
        type: integer
      isOpen:
        type: boolean
      method:
        $ref: '#/definitions/constvar.PlcMethod'
      port:
        description: plc 端口号，  method =  modbusTCP用
        type: integer
      serialName:
        description: 串口名称，method = serial时 用
        type: string
    type: object
  model.DevicePlcAddress:
    properties:
      fieldName:
        allOf:
        - $ref: '#/definitions/constvar.PlcStartAddressType'
        description: 对应系统字段
      length:
        description: 数据长度
        type: integer
      startAddress:
        description: 数据起始地址
        type: integer
      type:
        allOf:
        - $ref: '#/definitions/constvar.PlcStartAddressValueType'
        description: 数据类型
    type: object
  model.NetConfig:
    properties:
@@ -178,6 +252,35 @@
      name:
        type: string
    type: object
  request.UpdatePlc:
    properties:
      address:
        description: |-
          PortName   string `gorm:"type:varchar(191);comment:端口名称" json:"portName"`
          Frequency  int    `gorm:"type:int(11);comment:数据更新频率 0-实时更新 1-1次/秒" json:"frequency"`
        type: string
      baudRate:
        description: 串口波特率， method = serial时 用
        type: integer
      brand:
        type: string
      details:
        items:
          $ref: '#/definitions/model.DevicePlcAddress'
        type: array
      id:
        type: integer
      isOpen:
        type: boolean
      method:
        $ref: '#/definitions/constvar.PlcMethod'
      port:
        description: plc 端口号，  method =  modbusTCP用
        type: integer
      serialName:
        description: 串口名称，method = serial时 用
        type: string
    type: object
  request.UpdatePlcBrand:
    properties:
      id:
@@ -201,14 +304,40 @@
        type: string
      value: {}
    type: object
  response.ProcessParamsResponse:
    properties:
      number:
        type: string
      params:
        items:
          $ref: '#/definitions/response.ProcessParams'
        type: array
    type: object
  response.ProductProgress:
    properties:
      finishNumber:
        type: integer
      totalNumber:
        type: integer
    type: object
  response.TaskCountdown:
    properties:
      countDownHour:
        description: 倒计时 时
        type: integer
      countDownMinute:
        description: 倒计时 分
        type: integer
      showCountDown:
        description: 是否展示倒计时
        type: boolean
    type: object
  response.TaskData:
    properties:
      deviceName:
        type: string
      deviceStatus:
        type: string
      nextProcedure:
        $ref: '#/definitions/model.Procedures'
      order:
        $ref: '#/definitions/model.Order'
      procedure:
@@ -217,50 +346,6 @@
info:
  contact: {}
paths:
  /v1/cc/nn:
    get:
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            allOf:
            - $ref: '#/definitions/contextx.Response'
            - properties:
                data:
                  items:
                    $ref: '#/definitions/model.NetConfig'
                  type: array
              type: object
      summary: 获取网络配置
      tags:
      - Config
    put:
      parameters:
      - description: 参数
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/model.NetConfig'
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            allOf:
            - $ref: '#/definitions/contextx.Response'
            - properties:
                data:
                  items:
                    $ref: '#/definitions/response.ProcessParams'
                  type: array
              type: object
      summary: 设置网络配置
      tags:
      - Config
  /v1/config/net:
    get:
      produces:
@@ -280,7 +365,7 @@
      summary: 获取网络配置
      tags:
      - Config
    put:
    post:
      parameters:
      - description: 参数
        in: body
@@ -305,6 +390,70 @@
      summary: 设置网络配置
      tags:
      - Config
  /v1/config/plc:
    get:
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            allOf:
            - $ref: '#/definitions/contextx.Response'
            - properties:
                data:
                  $ref: '#/definitions/model.DevicePlc'
              type: object
      summary: 获取plc配置
      tags:
      - Config
    post:
      parameters:
      - description: 查询参数
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.UpdatePlc'
      produces:
      - application/json
      responses:
        "200":
          description: OK
          schema:
            $ref: '#/definitions/contextx.Response'
      summary: 更新plc配置
      tags:
      - Config
  /v1/plc/productProgress:
    get:
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            allOf:
            - $ref: '#/definitions/contextx.Response'
            - properties:
                data:
                  $ref: '#/definitions/response.ProductProgress'
              type: object
      summary: 获取生产进度
      tags:
      - 生产数量
  /v1/plc/setProductNumber:
    post:
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            $ref: '#/definitions/contextx.Response'
      summary: 设置生产总量
      tags:
      - 生产数量
  /v1/plcBrand/add:
    post:
      parameters:
@@ -380,6 +529,23 @@
      summary: 更新plc品牌
      tags:
      - plc品牌
  /v1/task/countdown:
    get:
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            allOf:
            - $ref: '#/definitions/contextx.Response'
            - properties:
                data:
                  $ref: '#/definitions/response.TaskCountdown'
              type: object
      summary: 新任务倒计时
      tags:
      - Task
  /v1/task/finish/{id}:
    put:
      parameters:
@@ -451,9 +617,7 @@
            - $ref: '#/definitions/contextx.Response'
            - properties:
                data:
                  items:
                    $ref: '#/definitions/response.ProcessParams'
                  type: array
                  $ref: '#/definitions/response.ProcessParamsResponse'
              type: object
      summary: 任务开始
      tags: