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 | 272 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 243 insertions(+), 29 deletions(-)
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 6a2ec4e..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:
@@ -36,6 +41,10 @@
items:
$ref: '#/definitions/common.ProcedureMaterial'
type: array
+ nextProcedureId:
+ type: string
+ nextProcedureName:
+ type: string
outputMaterials:
description: 杈撳嚭鐗╂枡鍒楄〃
items:
@@ -55,6 +64,34 @@
$ref: '#/definitions/common.ProcedureWorker'
type: array
type: object
+ constvar.PlcMethod:
+ enum:
+ - modbusTCP
+ - serial
+ - 缃戠粶
+ - 涓插彛
+ type: string
+ x-enum-varnames:
+ - PlcMethodModbusTCP
+ - PlcMethodSerial
+ - PlcMethodModbusTCPChinese
+ - PlcMethodSerialChinese
+ constvar.PlcStartAddressType:
+ enum:
+ - 1
+ - 2
+ type: integer
+ x-enum-varnames:
+ - PlcStartAddressTypeFinishNumber
+ - PlcStartAddressTypeTotalNumber
+ constvar.PlcStartAddressValueType:
+ enum:
+ - string
+ - int
+ type: string
+ x-enum-varnames:
+ - PlcStartAddressValueTypeString
+ - PlcStartAddressValueTypeInt
contextx.Response:
properties:
code:
@@ -66,40 +103,51 @@
model.DevicePlc:
properties:
address:
+ description: |-
+ PortName string `gorm:"type:varchar(191);comment:绔彛鍚嶇О" json:"portName"`
+ Frequency int `gorm:"comment:鏁版嵁鏇存柊棰戠巼 0-瀹炴椂鏇存柊 1-1娆�/绉�" json:"frequency"`
type: string
+ baudRate:
+ description: 涓插彛娉㈢壒鐜囷紝 method = serial鏃� 鐢�
+ type: integer
brand:
type: string
details:
items:
$ref: '#/definitions/model.DevicePlcAddress'
type: array
- frequency:
- type: integer
id:
type: integer
isOpen:
type: boolean
method:
- type: string
+ $ref: '#/definitions/constvar.PlcMethod'
port:
+ description: plc 绔彛鍙凤紝 method = modbusTCP鐢�
type: integer
- portName:
+ serialName:
+ description: 涓插彛鍚嶇О锛宮ethod = serial鏃� 鐢�
type: string
type: object
model.DevicePlcAddress:
properties:
fieldName:
+ allOf:
+ - $ref: '#/definitions/constvar.PlcStartAddressType'
description: 瀵瑰簲绯荤粺瀛楁
- type: string
length:
description: 鏁版嵁闀垮害
+ type: integer
+ position:
+ description: 鏁版嵁璧峰鍦板潃
type: integer
startAddress:
description: 鏁版嵁璧峰鍦板潃
type: integer
type:
+ allOf:
+ - $ref: '#/definitions/constvar.PlcStartAddressValueType'
description: 鏁版嵁绫诲瀷
- type: string
type: object
model.NetConfig:
properties:
@@ -175,9 +223,11 @@
enum:
- 1
- 2
+ - 3
type: integer
x-enum-varnames:
- - OrderStatusUnFinished
+ - OrderStatusWaitProcess
+ - OrderStatusProcessing
- OrderStatusFinished
model.PlcBrand:
properties:
@@ -190,20 +240,29 @@
enum:
- 1
- 2
+ - 3
type: integer
x-enum-varnames:
- - ProcedureStatusUnFinished
+ - ProcedureStatusWaitProcess
+ - ProcedureStatusProcessing
- ProcedureStatusFinished
model.Procedures:
properties:
+ deviceId:
+ type: string
endTime:
type: integer
id:
+ type: integer
+ position:
+ description: 姣忎釜璁惧鍙兘鏈夊涓満浣嶅悓鏃剁敓浜э紝鐢╬osition琛ㄧず浣嶇疆
type: integer
procedure:
allOf:
- $ref: '#/definitions/common.ProductProcedure'
description: common.ProductProcedure 瀵硅薄
+ procedureId:
+ type: string
startTime:
type: integer
status:
@@ -216,27 +275,42 @@
name:
type: string
type: object
+ request.SendProcessParams:
+ properties:
+ position:
+ type: integer
+ procedureId:
+ type: integer
+ required:
+ - procedureId
+ type: object
request.UpdatePlc:
properties:
address:
+ description: |-
+ PortName string `gorm:"type:varchar(191);comment:绔彛鍚嶇О" json:"portName"`
+ Frequency int `gorm:"comment:鏁版嵁鏇存柊棰戠巼 0-瀹炴椂鏇存柊 1-1娆�/绉�" json:"frequency"`
type: string
+ baudRate:
+ description: 涓插彛娉㈢壒鐜囷紝 method = serial鏃� 鐢�
+ type: integer
brand:
type: string
details:
items:
$ref: '#/definitions/model.DevicePlcAddress'
type: array
- frequency:
- type: integer
id:
type: integer
isOpen:
type: boolean
method:
- type: string
+ $ref: '#/definitions/constvar.PlcMethod'
port:
+ description: plc 绔彛鍙凤紝 method = modbusTCP鐢�
type: integer
- portName:
+ serialName:
+ description: 涓插彛鍚嶇О锛宮ethod = serial鏃� 鐢�
type: string
type: object
request.UpdatePlcBrand:
@@ -262,16 +336,52 @@
type: string
value: {}
type: object
+ response.ProcessParamsResponse:
+ properties:
+ number:
+ type: string
+ params:
+ items:
+ $ref: '#/definitions/response.ProcessParams'
+ type: array
+ type: object
+ response.ProductProgress:
+ properties:
+ finishNumber:
+ type: integer
+ plcStatus:
+ type: integer
+ totalNumber:
+ type: integer
+ type: object
+ response.TaskCountdown:
+ properties:
+ countDownHour:
+ description: 鍊掕鏃� 鏃�
+ type: integer
+ countDownMinute:
+ description: 鍊掕鏃� 鍒�
+ type: integer
+ showCountDown:
+ description: 鏄惁灞曠ず鍊掕鏃�
+ type: boolean
+ type: object
response.TaskData:
properties:
- deviceName:
- type: string
- deviceStatus:
- type: string
- nextProcedure:
- $ref: '#/definitions/model.Procedures'
+ allProcedures:
+ 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
@@ -357,6 +467,59 @@
summary: 鏇存柊plc閰嶇疆
tags:
- Config
+ /v1/plc/productProgress:
+ post:
+ parameters:
+ - description: 鏌ヨ鍙傛暟
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.SendProcessParams'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/contextx.Response'
+ - properties:
+ data:
+ $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:
+ post:
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/contextx.Response'
+ summary: 璁剧疆鐢熶骇鎬婚噺
+ tags:
+ - 鐢熶骇鏁伴噺
/v1/plcBrand/add:
post:
parameters:
@@ -432,6 +595,23 @@
summary: 鏇存柊plc鍝佺墝
tags:
- plc鍝佺墝
+ /v1/task/countdown:
+ get:
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/contextx.Response'
+ - properties:
+ data:
+ $ref: '#/definitions/response.TaskCountdown'
+ type: object
+ summary: 鏂颁换鍔″�掕鏃�
+ tags:
+ - Task
/v1/task/finish/{id}:
put:
parameters:
@@ -452,6 +632,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:
@@ -467,13 +656,16 @@
summary: 鑾峰彇浠诲姟
tags:
- Task
- /v1/task/sendProcessParams/{id}:
- post:
+ /v1/task/get/unStarted:
+ get:
parameters:
- - description: 宸ュ簭id
- in: path
- name: id
- required: true
+ - description: 椤电爜
+ in: query
+ name: page
+ type: integer
+ - description: 姣忛〉澶у皬
+ in: query
+ name: pageSize
type: integer
produces:
- application/json
@@ -481,8 +673,32 @@
"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: 鏌ヨ鍙傛暟
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.SendProcessParams'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
$ref: '#/definitions/contextx.Response'
- summary: 涓嬪彂宸ヨ壓鍙傛暟
+ summary: 涓嬪彂宸ヨ壓鍙傛暟锛堝紑濮嬩换鍔★級
tags:
- Task
/v1/task/start/{id}:
@@ -503,11 +719,9 @@
- $ref: '#/definitions/contextx.Response'
- properties:
data:
- items:
- $ref: '#/definitions/response.ProcessParams'
- type: array
+ $ref: '#/definitions/response.ProcessParamsResponse'
type: object
- summary: 浠诲姟寮�濮�
+ summary: 浠诲姟寮�濮嬶紙鑾峰彇宸ヨ壓鍙傛暟锛�
tags:
- Task
swagger: "2.0"
--
Gitblit v1.8.0