From 196437f8ba646344cf25c9fa4bd3797ca40e2154 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 13 九月 2023 15:40:54 +0800
Subject: [PATCH] 支持获取多个任务，增加任务数量统计
---
docs/swagger.yaml | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 34d675d..2fe29b4 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -211,9 +211,11 @@
enum:
- 1
- 2
+ - 3
type: integer
x-enum-varnames:
- - OrderStatusUnFinished
+ - OrderStatusWaitProcess
+ - OrderStatusProcessing
- OrderStatusFinished
model.PlcBrand:
properties:
@@ -226,12 +228,16 @@
enum:
- 1
- 2
+ - 3
type: integer
x-enum-varnames:
- - ProcedureStatusUnFinished
+ - ProcedureStatusWaitProcess
+ - ProcedureStatusProcessing
- ProcedureStatusFinished
model.Procedures:
properties:
+ deviceId:
+ type: string
endTime:
type: integer
id:
@@ -240,6 +246,8 @@
allOf:
- $ref: '#/definitions/common.ProductProcedure'
description: common.ProductProcedure 瀵硅薄
+ procedureId:
+ type: string
startTime:
type: integer
status:
@@ -334,10 +342,12 @@
type: object
response.TaskData:
properties:
- deviceName:
- type: string
- deviceStatus:
- type: string
+ allProcedures:
+ items:
+ type: string
+ type: array
+ currentProcedureIndex:
+ type: integer
order:
$ref: '#/definitions/model.Order'
procedure:
@@ -566,6 +576,15 @@
- Task
/v1/task/get:
get:
+ parameters:
+ - description: 椤电爜
+ in: query
+ name: page
+ type: integer
+ - description: 姣忛〉澶у皬
+ in: query
+ name: pageSize
+ type: integer
produces:
- application/json
responses:
@@ -596,7 +615,7 @@
description: 鎴愬姛
schema:
$ref: '#/definitions/contextx.Response'
- summary: 涓嬪彂宸ヨ壓鍙傛暟
+ summary: 涓嬪彂宸ヨ壓鍙傛暟锛堝紑濮嬩换鍔★級
tags:
- Task
/v1/task/start/{id}:
@@ -619,7 +638,7 @@
data:
$ref: '#/definitions/response.ProcessParamsResponse'
type: object
- summary: 浠诲姟寮�濮�
+ summary: 浠诲姟寮�濮嬶紙鑾峰彇宸ヨ壓鍙傛暟锛�
tags:
- Task
swagger: "2.0"
--
Gitblit v1.8.0