From 71cc6deae4b873c3382895054fe2bd6816290755 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 22 九月 2023 20:25:25 +0800
Subject: [PATCH] 增加安全生产提示语配置
---
docs/swagger.yaml | 74 +++++++++++++++++++++++++++++++++++--
1 files changed, 70 insertions(+), 4 deletions(-)
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index ea79766..db53996 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -25,6 +25,11 @@
type: object
common.ProductProcedure:
properties:
+ allProcedureNames:
+ description: 鎵�灞炲伐鍗曞伐搴忓垪琛�
+ items:
+ type: string
+ type: array
deviceId:
type: string
deviceName:
@@ -63,10 +68,14 @@
enum:
- modbusTCP
- serial
+ - 缃戠粶
+ - 涓插彛
type: string
x-enum-varnames:
- PlcMethodModbusTCP
- PlcMethodSerial
+ - PlcMethodModbusTCPChinese
+ - PlcMethodSerialChinese
constvar.PlcStartAddressType:
enum:
- 1
@@ -96,7 +105,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鏃� 鐢�
@@ -128,6 +137,9 @@
description: 瀵瑰簲绯荤粺瀛楁
length:
description: 鏁版嵁闀垮害
+ type: integer
+ position:
+ description: 鏁版嵁璧峰鍦板潃
type: integer
startAddress:
description: 鏁版嵁璧峰鍦板潃
@@ -242,6 +254,9 @@
type: integer
id:
type: integer
+ position:
+ description: 姣忎釜璁惧鍙兘鏈夊涓満浣嶅悓鏃剁敓浜э紝鐢╬osition琛ㄧず浣嶇疆
+ type: integer
procedure:
allOf:
- $ref: '#/definitions/common.ProductProcedure'
@@ -274,7 +289,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鏃� 鐢�
@@ -334,6 +349,8 @@
properties:
finishNumber:
type: integer
+ plcStatus:
+ type: integer
totalNumber:
type: integer
type: object
@@ -355,10 +372,16 @@
items:
type: string
type: array
+ canStarted:
+ description: 鏄惁鍙互寮�濮嬬敓浜�
+ type: boolean
currentProcedureIndex:
type: integer
order:
$ref: '#/definitions/model.Order'
+ position:
+ description: 褰撳墠浠诲姟鍦ㄨ澶囩鍑犱釜浣嶇疆
+ type: integer
procedure:
$ref: '#/definitions/model.Procedures'
type: object
@@ -445,7 +468,7 @@
tags:
- Config
/v1/plc/productProgress:
- get:
+ post:
parameters:
- description: 鏌ヨ鍙傛暟
in: body
@@ -466,6 +489,23 @@
$ref: '#/definitions/response.ProductProgress'
type: object
summary: 鑾峰彇鐢熶骇杩涘害
+ tags:
+ - 鐢熶骇鏁伴噺
+ /v1/plc/productProgressRealTime:
+ post:
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/contextx.Response'
+ - properties:
+ data:
+ $ref: '#/definitions/response.ProductProgress'
+ type: object
+ summary: 瀹炴椂鑾峰彇鐢熶骇杩涘害
tags:
- 鐢熶骇鏁伴噺
/v1/plc/setProductNumber:
@@ -616,7 +656,33 @@
summary: 鑾峰彇浠诲姟
tags:
- Task
- /v1/task/sendProcessParams/{id}:
+ /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:
post:
parameters:
- description: 鏌ヨ鍙傛暟
--
Gitblit v1.8.0