From fcacdbf9aa2598cbb08a880069abf892d69d061f Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 27 十一月 2023 17:24:06 +0800
Subject: [PATCH] fix

---
 docs/swagger.yaml |  183 ++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 176 insertions(+), 7 deletions(-)

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index e027ea9..f69843e 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -57,6 +57,8 @@
         type: string
       procedureName:
         type: string
+      productProcedureID:
+        type: string
       startTime:
         type: integer
       workHours:
@@ -113,11 +115,13 @@
   constvar.PlcStartAddressValueType:
     enum:
     - string
-    - int
+    - int16
+    - int32
     type: string
     x-enum-varnames:
     - PlcStartAddressValueTypeString
-    - PlcStartAddressValueTypeInt
+    - PlcStartAddressValueTypeInt16
+    - PlcStartAddressValueTypeInt32
   constvar.ProblemCode:
     enum:
     - service
@@ -177,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:
@@ -385,6 +399,9 @@
       processModelNumber:
         description: 宸ヨ壓妯″瀷缂栧彿
         type: string
+      productProcedureID:
+        description: 浜у搧宸ュ簭id
+        type: string
       realEndTime:
         type: integer
       realStartTime:
@@ -432,6 +449,56 @@
       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: 鎶ュ伐浜篿d
+        type: string
+      workerName:
+        description: 鎶ュ伐浜哄鍚�
+        type: string
+      workerTime:
+        description: 宸ユ椂锛屽崟浣嶇
+        type: integer
+    type: object
   problem.CheckResult:
     properties:
       checkResult:
@@ -454,9 +521,17 @@
       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:
@@ -469,6 +544,22 @@
     - QueryTypeUnFinish
     - QueryTypeToday
     - QueryTypeFinished
+  request.ReportWork:
+    properties:
+      procedureId:
+        description: 宸ュ簭id
+        type: integer
+      reportAmount:
+        description: 鎶ュ伐鏁伴噺
+        type: integer
+      workerID:
+        description: 鎶ュ憡鑰卛d
+        type: string
+    required:
+    - procedureId
+    - reportAmount
+    - workerID
+    type: object
   request.SendProcessParams:
     properties:
       procedureId:
@@ -541,6 +632,16 @@
       updatedAt:
         type: string
     type: object
+  response.Device:
+    properties:
+      deviceID:
+        type: string
+      deviceName:
+        type: string
+      needSetProcessParams:
+        description: 鏄惁闇�瑕佽缃伐鑹哄弬鏁�
+        type: boolean
+    type: object
   response.DeviceListResponse:
     properties:
       clusterNodeQuantity:
@@ -552,10 +653,10 @@
       currentDeviceID:
         description: 褰撳墠閫夊畾鐨勭敓浜ц澶�
         type: string
-      deviceIDList:
+      deviceList:
         description: 鐢熶骇璁惧id鍒楄〃
         items:
-          type: string
+          $ref: '#/definitions/response.Device'
         type: array
       systemDeviceID:
         description: 宸ユ帶鏈鸿澶嘔D
@@ -753,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:
@@ -933,6 +1053,58 @@
       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:
@@ -990,9 +1162,6 @@
   /v1/task/get:
     get:
       parameters:
-      - in: query
-        name: deviceID
-        type: string
       - description: 椤电爜
         in: query
         name: page

--
Gitblit v1.8.0