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:
@@ -113,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
@@ -139,6 +181,16 @@
      data: {}
      msg:
        type: string
    type: object
  contextx.ResponseList:
    properties:
      code:
        type: integer
      data: {}
      msg:
        type: string
      total:
        type: integer
    type: object
  model.DevicePlc:
    properties:
@@ -347,6 +399,9 @@
      processModelNumber:
        description: 工艺模型编号
        type: string
      productProcedureID:
        description: 产品工序id
        type: string
      realEndTime:
        type: integer
      realStartTime:
@@ -394,6 +449,65 @@
      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:
@@ -407,6 +521,19 @@
      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
@@ -417,6 +544,22 @@
    - 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:
      procedureId:
@@ -489,19 +632,42 @@
      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
      deviceIDList:
      deviceList:
        description: 生产设备id列表
        items:
          type: string
          $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:
@@ -530,6 +696,10 @@
    type: object
  response.ProductProgress:
    properties:
      RealEndTime:
        type: integer
      RealStartTime:
        type: integer
      finishNumber:
        type: integer
      plcStatus:
@@ -537,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:
@@ -673,6 +854,25 @@
      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:
@@ -689,7 +889,7 @@
              type: object
      summary: 获取当前面板绑定的设备列表
      tags:
      - Device
      - 设备
  /v1/device/setCurrentDeviceId:
    post:
      parameters:
@@ -717,7 +917,7 @@
        name: object
        required: true
        schema:
          $ref: '#/definitions/request.SendProcessParams'
          $ref: '#/definitions/request.GetProductProgress'
      produces:
      - application/json
      responses:
@@ -823,11 +1023,6 @@
  /v1/processModel/list:
    get:
      parameters:
      - description: 当前正在使用的工艺参数编号
        in: query
        name: number
        required: true
        type: string
      - description: 页码
        in: query
        name: page
@@ -858,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:
@@ -896,9 +1162,6 @@
  /v1/task/get:
    get:
      parameters:
      - in: query
        name: deviceID
        type: string
      - description: 页码
        in: query
        name: page