From 4db8b372c61025a80af529a47872a6fec6daf854 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 27 九月 2023 10:21:30 +0800
Subject: [PATCH] 删除获取未开始任务接口，统一用获取任务接口

---
 docs/swagger.yaml |  110 ++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 73 insertions(+), 37 deletions(-)

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index db53996..c03e6d1 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -30,6 +30,9 @@
         items:
           type: string
         type: array
+      channel:
+        description: 閫氶亾搴忓彿
+        type: integer
       deviceId:
         type: string
       deviceName:
@@ -64,6 +67,13 @@
           $ref: '#/definitions/common.ProcedureWorker'
         type: array
     type: object
+  conf.Prompt:
+    properties:
+      plcNotConnected:
+        type: string
+      safeProduce:
+        type: string
+    type: object
   constvar.PlcMethod:
     enum:
     - modbusTCP
@@ -92,6 +102,20 @@
     x-enum-varnames:
     - PlcStartAddressValueTypeString
     - PlcStartAddressValueTypeInt
+  constvar.TaskMode:
+    enum:
+    - 1
+    - 2
+    - 3
+    type: integer
+    x-enum-comments:
+      TaskModeCurrent: 鏈紑濮嬬殑鍜岃繘琛屼腑鐨�
+      TaskModeLastFinished: 涓婁竴涓粨鏉熺殑
+      TaskModeUnStarted: 鏈紑濮嬬殑
+    x-enum-varnames:
+    - TaskModeUnStarted
+    - TaskModeCurrent
+    - TaskModeLastFinished
   contextx.Response:
     properties:
       code:
@@ -131,15 +155,15 @@
     type: object
   model.DevicePlcAddress:
     properties:
+      channel:
+        description: 鏁版嵁璧峰鍦板潃
+        type: integer
       fieldName:
         allOf:
         - $ref: '#/definitions/constvar.PlcStartAddressType'
         description: 瀵瑰簲绯荤粺瀛楁
       length:
         description: 鏁版嵁闀垮害
-        type: integer
-      position:
-        description: 鏁版嵁璧峰鍦板潃
         type: integer
       startAddress:
         description: 鏁版嵁璧峰鍦板潃
@@ -248,14 +272,14 @@
     - ProcedureStatusFinished
   model.Procedures:
     properties:
+      channel:
+        description: 閫氶亾
+        type: integer
       deviceId:
         type: string
       endTime:
         type: integer
       id:
-        type: integer
-      position:
-        description: 姣忎釜璁惧鍙兘鏈夊涓満浣嶅悓鏃剁敓浜э紝鐢╬osition琛ㄧず浣嶇疆
         type: integer
       procedure:
         allOf:
@@ -277,7 +301,7 @@
     type: object
   request.SendProcessParams:
     properties:
-      position:
+      channel:
         type: integer
       procedureId:
         type: integer
@@ -375,15 +399,38 @@
       canStarted:
         description: 鏄惁鍙互寮�濮嬬敓浜�
         type: boolean
+      channel:
+        description: 褰撳墠浠诲姟鍦ㄨ澶囩鍑犱釜閫氶亾
+        type: integer
       currentProcedureIndex:
         type: integer
       order:
         $ref: '#/definitions/model.Order'
-      position:
-        description: 褰撳墠浠诲姟鍦ㄨ澶囩鍑犱釜浣嶇疆
-        type: integer
       procedure:
         $ref: '#/definitions/model.Procedures'
+    type: object
+  response.TaskResponse:
+    properties:
+      channelAmount:
+        description: 閫氶亾鏁伴噺
+        type: integer
+      prompt:
+        allOf:
+        - $ref: '#/definitions/conf.Prompt'
+        description: 鎻愮ず璇�
+      taskCount:
+        description: 浠诲姟鏁伴噺
+        type: integer
+      tasks:
+        description: 浠诲姟鍒楄〃
+        items:
+          $ref: '#/definitions/response.TaskData'
+        type: array
+      workers:
+        description: 浜哄憳鍒楄〃
+        items:
+          $ref: '#/definitions/common.ProcedureWorker'
+        type: array
     type: object
 info:
   contact: {}
@@ -641,6 +688,21 @@
         in: query
         name: pageSize
         type: integer
+      - enum:
+        - 1
+        - 2
+        - 3
+        in: query
+        name: taskMode
+        type: integer
+        x-enum-comments:
+          TaskModeCurrent: 鏈紑濮嬬殑鍜岃繘琛屼腑鐨�
+          TaskModeLastFinished: 涓婁竴涓粨鏉熺殑
+          TaskModeUnStarted: 鏈紑濮嬬殑
+        x-enum-varnames:
+        - TaskModeUnStarted
+        - TaskModeCurrent
+        - TaskModeLastFinished
       produces:
       - application/json
       responses:
@@ -651,35 +713,9 @@
             - $ref: '#/definitions/contextx.Response'
             - properties:
                 data:
-                  $ref: '#/definitions/response.TaskData'
+                  $ref: '#/definitions/response.TaskResponse'
               type: object
       summary: 鑾峰彇浠诲姟
-      tags:
-      - Task
-  /v1/task/get/unStarted:
-    get:
-      parameters:
-      - description: 椤电爜
-        in: query
-        name: page
-        type: integer
-      - description: 姣忛〉澶у皬
-        in: query
-        name: pageSize
-        type: integer
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: 鎴愬姛
-          schema:
-            allOf:
-            - $ref: '#/definitions/contextx.Response'
-            - properties:
-                data:
-                  $ref: '#/definitions/response.TaskData'
-              type: object
-      summary: 鑾峰彇鏈紑濮嬬殑浠诲姟
       tags:
       - Task
   /v1/task/sendProcessParams:

--
Gitblit v1.8.0