fix

zhangqian

2023-11-27 fcacdbf9aa2598cbb08a880069abf892d69d061f

 docs/swagger.yaml

@@ -57,6 +57,8 @@
        type: string
      procedureName:
        type: string
      productProcedureID:
        type: string
      startTime:
        type: integer
      workHours:
@@ -74,15 +76,31 @@
      safeProduce:
        type: string
    type: object
  constvar.Parity:
    enum:
    - 1
    - 2
    - 3
    type: integer
    x-enum-comments:
      ParityEven: 奇校验
      ParityNull: 无校验
      ParityOdd: 偶校验
    x-enum-varnames:
    - ParityEven
    - ParityOdd
    - ParityNull
  constvar.PlcMethod:
    enum:
    - modbusTCP
    - modbusRTU
    - serial
    - 网络
    - 串口
    type: string
    x-enum-varnames:
    - PlcMethodModbusTCP
    - PlcMethodModbusRTU
    - PlcMethodSerial
    - PlcMethodModbusTCPChinese
    - PlcMethodSerialChinese
@@ -97,11 +115,51 @@
  constvar.PlcStartAddressValueType:
    enum:
    - string
    - int
    - int16
    - int32
    type: string
    x-enum-varnames:
    - PlcStartAddressValueTypeString
    - PlcStartAddressValueTypeInt
    - PlcStartAddressValueTypeInt16
    - PlcStartAddressValueTypeInt32
  constvar.ProblemCode:
    enum:
    - service
    - network
    - db
    - serf
    - cloud
    - device
    - process_model
    - plc_config
    - plc_address_list
    - plc_process_model_address_list
    - plc_connect
    type: string
    x-enum-comments:
      ProblemCodeCloud: 未连接云端
      ProblemCodeDB: 数据库连接错误
      ProblemCodeDevice: 未绑定设备
      ProblemCodeNetwork: 网络错误
      ProblemCodePlcAddressList: plc地址表缺失
      ProblemCodePlcConfig: plc配置缺失
      ProblemCodePlcConnect: plc连接失败
      ProblemCodePlcProcessModelAddressList: plc地址表缺失
      ProblemCodeProcessModel: 工艺参数缺失
      ProblemCodeSerf: 未加入serf集群
      ProblemCodeService: 服务不可用
    x-enum-varnames:
    - ProblemCodeService
    - ProblemCodeNetwork
    - ProblemCodeDB
    - ProblemCodeSerf
    - ProblemCodeCloud
    - ProblemCodeDevice
    - ProblemCodeProcessModel
    - ProblemCodePlcConfig
    - ProblemCodePlcAddressList
    - ProblemCodePlcProcessModelAddressList
    - ProblemCodePlcConnect
  constvar.TaskMode:
    enum:
    - 1
@@ -124,33 +182,60 @@
      msg:
        type: string
    type: object
  contextx.ResponseList:
    properties:
      code:
        type: integer
      data: {}
      msg:
        type: string
      total:
        type: integer
    type: object
  model.DevicePlc:
    properties:
      address:
        description: |-
          PortName   string `gorm:"type:varchar(191);comment:端口名称" json:"portName"`
          Frequency  int    `gorm:"comment:数据更新频率 0-实时更新 1-1次/秒" json:"frequency"`
        description: plc ip地址， method = modbusTCP用
        type: string
      baudRate:
        description: 串口波特率， method = serial时 用
        type: integer
      brand:
        type: string
      createdAt:
        type: string
      dataBit:
        description: 数据位，method = modbusRTU 用
        type: integer
      deletedAt:
        type: string
      details:
        items:
          $ref: '#/definitions/model.DevicePlcAddress'
        type: array
      deviceID:
        description: 设备编号
        type: string
      id:
        type: integer
      isOpen:
        type: boolean
      method:
        $ref: '#/definitions/constvar.PlcMethod'
      parity:
        allOf:
        - $ref: '#/definitions/constvar.Parity'
        description: 校验方式，method = modbusRTU 用
      port:
        description: plc 端口号，  method =  modbusTCP用
        type: integer
      serialName:
        description: 串口名称，method = serial时 用
        type: string
      stopBit:
        description: 停止位，method = modbusRTU 用
        type: integer
      updatedAt:
        type: string
    type: object
  model.DevicePlcAddress:
@@ -175,6 +260,10 @@
    type: object
  model.NetConfig:
    properties:
      createdAt:
        type: string
      deletedAt:
        type: string
      dns:
        description: dns
        type: string
@@ -196,6 +285,8 @@
        allOf:
        - $ref: '#/definitions/model.NetConfigStatus'
        description: 状态（1启用2禁用）
      updatedAt:
        type: string
    required:
    - gateway
    - ip
@@ -217,11 +308,17 @@
    properties:
      amount:
        type: number
      createdAt:
        type: string
      customer:
        type: string
      deletedAt:
        type: string
      deliverDate:
        type: string
      endTime:
        type: integer
      id:
        type: integer
      orderAttr:
        description: 订单属性拼接的字符串，即货物描述
@@ -240,6 +337,8 @@
        $ref: '#/definitions/model.OrderStatus'
      unit:
        type: string
      updatedAt:
        type: string
      workOrderId:
        type: string
    type: object
@@ -255,9 +354,15 @@
    - OrderStatusFinished
  model.PlcBrand:
    properties:
      createdAt:
        type: string
      deletedAt:
        type: string
      id:
        type: integer
      name:
        type: string
      updatedAt:
        type: string
    type: object
  model.ProcedureStatus:
@@ -275,6 +380,10 @@
      channel:
        description: 通道
        type: integer
      createdAt:
        type: string
      deletedAt:
        type: string
      deviceId:
        type: string
      endTime:
@@ -290,16 +399,31 @@
      processModelNumber:
        description: 工艺模型编号
        type: string
      productProcedureID:
        description: 产品工序id
        type: string
      realEndTime:
        type: integer
      realStartTime:
        type: integer
      startTime:
        type: integer
      status:
        $ref: '#/definitions/model.ProcedureStatus'
      updatedAt:
        type: string
    type: object
  model.ProcessModel:
    properties:
      createdAt:
        type: string
      deletedAt:
        type: string
      deviceId:
        description: 用于过滤获取nsq消息
        type: string
      id:
        type: integer
      isUpdate:
        description: 前端用
        type: boolean
@@ -322,13 +446,119 @@
      product:
        description: 产品名称
        type: string
      updatedAt:
        type: string
    type: object
  model.ReportWork:
    properties:
      barCode:
        description: 条形码
        type: string
      channel:
        description: 通道
        type: integer
      createdAt:
        type: string
      deletedAt:
        type: string
      deviceId:
        type: string
      deviceName:
        type: string
      endTime:
        type: integer
      finishAmount:
        description: 本次报工 - 上次报工
        type: integer
      id:
        type: integer
      procedureId:
        type: string
      proceduresId:
        description: procedures表的id
        type: integer
      productProcedureID:
        description: 产品工序id
        type: string
      reportAmount:
        description: 报工数量
        type: integer
      startTime:
        type: integer
      updatedAt:
        type: string
      workOrderId:
        type: string
      workerID:
        description: 报工人id
        type: string
      workerName:
        description: 报工人姓名
        type: string
      workerTime:
        description: 工时，单位秒
        type: integer
    type: object
  problem.CheckResult:
    properties:
      checkResult:
        type: boolean
      itemCode:
        $ref: '#/definitions/constvar.ProblemCode'
      itemName:
        type: string
    type: object
  request.AddPlcBrand:
    properties:
      createdAt:
        type: string
      deletedAt:
        type: string
      id:
        type: integer
      name:
        type: string
      updatedAt:
        type: string
    type: object
  request.DeviceConfig:
    properties:
      needSetProcessParams:
        description: 是否需要设置工艺参数
        type: boolean
    type: object
  request.GetProductProgress:
    properties:
      channel:
        type: integer
      procedureId:
        type: integer
    type: object
  request.QueryType:
    enum:
    - 1
    - 2
    - 3
    type: integer
    x-enum-varnames:
    - QueryTypeUnFinish
    - QueryTypeToday
    - QueryTypeFinished
  request.ReportWork:
    properties:
      procedureId:
        description: 工序id
        type: integer
      reportAmount:
        description: 报工数量
        type: integer
      workerID:
        description: 报告者id
        type: string
    required:
    - procedureId
    - reportAmount
    - workerID
    type: object
  request.SendProcessParams:
    properties:
@@ -337,41 +567,107 @@
    required:
    - procedureId
    type: object
  request.SetCurrentDevice:
    properties:
      currentDeviceID:
        description: 当前选定的生产设备
        type: string
    type: object
  request.UpdatePlc:
    properties:
      address:
        description: |-
          PortName   string `gorm:"type:varchar(191);comment:端口名称" json:"portName"`
          Frequency  int    `gorm:"comment:数据更新频率 0-实时更新 1-1次/秒" json:"frequency"`
        description: plc ip地址， method = modbusTCP用
        type: string
      baudRate:
        description: 串口波特率， method = serial时 用
        type: integer
      brand:
        type: string
      createdAt:
        type: string
      dataBit:
        description: 数据位，method = modbusRTU 用
        type: integer
      deletedAt:
        type: string
      details:
        items:
          $ref: '#/definitions/model.DevicePlcAddress'
        type: array
      deviceID:
        description: 设备编号
        type: string
      id:
        type: integer
      isOpen:
        type: boolean
      method:
        $ref: '#/definitions/constvar.PlcMethod'
      parity:
        allOf:
        - $ref: '#/definitions/constvar.Parity'
        description: 校验方式，method = modbusRTU 用
      port:
        description: plc 端口号，  method =  modbusTCP用
        type: integer
      serialName:
        description: 串口名称，method = serial时 用
        type: string
      stopBit:
        description: 停止位，method = modbusRTU 用
        type: integer
      updatedAt:
        type: string
    type: object
  request.UpdatePlcBrand:
    properties:
      createdAt:
        type: string
      deletedAt:
        type: string
      id:
        type: integer
      name:
        type: string
      updatedAt:
        type: string
    type: object
  response.Device:
    properties:
      deviceID:
        type: string
      deviceName:
        type: string
      needSetProcessParams:
        description: 是否需要设置工艺参数
        type: boolean
    type: object
  response.DeviceListResponse:
    properties:
      clusterNodeQuantity:
        description: 集群节点数量
        type: integer
      clusterStatus:
        description: 集群状态
        type: string
      currentDeviceID:
        description: 当前选定的生产设备
        type: string
      deviceList:
        description: 生产设备id列表
        items:
          $ref: '#/definitions/response.Device'
        type: array
      systemDeviceID:
        description: 工控机设备ID
        type: string
      systemDeviceRunSince:
        description: 系统运行开始时间戳
        type: integer
      systemDeviceStatus:
        allOf:
        - $ref: '#/definitions/response.SystemDeviceStatus'
        description: 设备状态
    type: object
  response.ListResponse:
    properties:
@@ -400,6 +696,10 @@
    type: object
  response.ProductProgress:
    properties:
      RealEndTime:
        type: integer
      RealStartTime:
        type: integer
      finishNumber:
        type: integer
      plcStatus:
@@ -407,6 +707,17 @@
      totalNumber:
        type: integer
    type: object
  response.SystemDeviceStatus:
    enum:
    - 1
    - 2
    type: integer
    x-enum-comments:
      SystemDeviceStatusNormal: 正常
      SystemDeviceStatusUnNormal: 异常
    x-enum-varnames:
    - SystemDeviceStatusNormal
    - SystemDeviceStatusUnNormal
  response.TaskCountdown:
    properties:
      countDownHour:
@@ -543,6 +854,61 @@
      summary: 更新plc配置
      tags:
      - Config
  /v1/device/config:
    post:
      parameters:
      - description: 查询参数
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.DeviceConfig'
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            $ref: '#/definitions/contextx.Response'
      summary: 设置设备一些配置
      tags:
      - 设备
  /v1/device/list:
    get:
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            allOf:
            - $ref: '#/definitions/contextx.Response'
            - properties:
                data:
                  $ref: '#/definitions/response.DeviceListResponse'
              type: object
      summary: 获取当前面板绑定的设备列表
      tags:
      - 设备
  /v1/device/setCurrentDeviceId:
    post:
      parameters:
      - description: 查询参数
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.SetCurrentDevice'
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            $ref: '#/definitions/contextx.Response'
      summary: 设置当前设备id
      tags:
      - 设备
  /v1/plc/productProgress:
    post:
      parameters:
@@ -551,7 +917,7 @@
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.SendProcessParams'
          $ref: '#/definitions/request.GetProductProgress'
      produces:
      - application/json
      responses:
@@ -565,23 +931,6 @@
                  $ref: '#/definitions/response.ProductProgress'
              type: object
      summary: 获取生产进度
      tags:
      - 生产数量
  /v1/plc/productProgressRealTime:
    post:
      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:
@@ -674,11 +1023,6 @@
  /v1/processModel/list:
    get:
      parameters:
      - description: 当前正在使用的工艺参数编号
        in: query
        name: number
        required: true
        type: string
      - description: 页码
        in: query
        name: page
@@ -709,6 +1053,77 @@
      summary: 获取工艺模型列表
      tags:
      - 工艺模型
  /v1/reportWork/list:
    get:
      parameters:
      - description: 页码
        in: query
        name: page
        type: integer
      - description: 每页大小
        in: query
        name: pageSize
        type: integer
      - description: 工序id
        in: query
        name: procedureId
        required: true
        type: integer
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            allOf:
            - $ref: '#/definitions/contextx.ResponseList'
            - properties:
                data:
                  items:
                    $ref: '#/definitions/model.ReportWork'
                  type: array
              type: object
      summary: 报工列表
      tags:
      - 报工
  /v1/reportWork/report:
    post:
      parameters:
      - description: 查询参数
        in: body
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.ReportWork'
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            $ref: '#/definitions/contextx.Response'
      summary: 上报
      tags:
      - 报工
  /v1/system/problemList:
    get:
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            allOf:
            - $ref: '#/definitions/contextx.Response'
            - properties:
                data:
                  items:
                    $ref: '#/definitions/problem.CheckResult'
                  type: array
              type: object
      summary: 问题诊断/问题列表
      tags:
      - 系统
  /v1/task/countdown:
    get:
      produces:
@@ -785,6 +1200,53 @@
      summary: 获取任务
      tags:
      - Task
  /v1/task/list:
    get:
      parameters:
      - description: 通道号。不传取全部的
        in: query
        name: channel
        type: integer
      - in: query
        name: deviceID
        type: string
      - description: 默认3
        in: query
        name: limit
        type: integer
      - description: 默认0
        in: query
        name: offset
        type: integer
      - description: 1 未完成 2 今天未完成 3 已完成
        enum:
        - 1
        - 2
        - 3
        in: query
        name: type
        type: integer
        x-enum-varnames:
        - QueryTypeUnFinish
        - QueryTypeToday
        - QueryTypeFinished
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            allOf:
            - $ref: '#/definitions/contextx.Response'
            - properties:
                data:
                  additionalProperties:
                    $ref: '#/definitions/response.TaskResponse'
                  type: object
              type: object
      summary: 获取任务列表2
      tags:
      - Task
  /v1/task/sendProcessParams:
    post:
      parameters: