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 | 98 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 78 insertions(+), 20 deletions(-)
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 7074af1..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:
@@ -105,7 +129,7 @@
address:
description: |-
PortName string `gorm:"type:varchar(191);comment:绔彛鍚嶇О" json:"portName"`
- Frequency int `gorm:"type:int(11);comment:鏁版嵁鏇存柊棰戠巼 0-瀹炴椂鏇存柊 1-1娆�/绉�" json:"frequency"`
+ Frequency int `gorm:"comment:鏁版嵁鏇存柊棰戠巼 0-瀹炴椂鏇存柊 1-1娆�/绉�" json:"frequency"`
type: string
baudRate:
description: 涓插彛娉㈢壒鐜囷紝 method = serial鏃� 鐢�
@@ -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
@@ -289,7 +313,7 @@
address:
description: |-
PortName string `gorm:"type:varchar(191);comment:绔彛鍚嶇О" json:"portName"`
- Frequency int `gorm:"type:int(11);comment:鏁版嵁鏇存柊棰戠巼 0-瀹炴椂鏇存柊 1-1娆�/绉�" json:"frequency"`
+ Frequency int `gorm:"comment:鏁版嵁鏇存柊棰戠巼 0-瀹炴椂鏇存柊 1-1娆�/绉�" json:"frequency"`
type: string
baudRate:
description: 涓插彛娉㈢壒鐜囷紝 method = serial鏃� 鐢�
@@ -372,15 +396,41 @@
items:
type: string
type: array
+ 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: {}
@@ -490,13 +540,6 @@
- 鐢熶骇鏁伴噺
/v1/plc/productProgressRealTime:
post:
- parameters:
- - description: 鏌ヨ鍙傛暟
- in: body
- name: object
- required: true
- schema:
- $ref: '#/definitions/request.SendProcessParams'
produces:
- application/json
responses:
@@ -645,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:
@@ -655,7 +713,7 @@
- $ref: '#/definitions/contextx.Response'
- properties:
data:
- $ref: '#/definitions/response.TaskData'
+ $ref: '#/definitions/response.TaskResponse'
type: object
summary: 鑾峰彇浠诲姟
tags:
--
Gitblit v1.8.0