From e6c81b3916494ef51edc21774a27402d0f16c49c Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 24 八月 2023 17:21:04 +0800
Subject: [PATCH] plc配置支持serial和modbusTCP两种方式
---
docs/docs.go | 108 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 90 insertions(+), 18 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index f066af8..1f4a9ab 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -152,6 +152,37 @@
}
}
},
+ "/v1/plc/productProgress": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鑾峰彇鍔ㄦ�佹暟鎹�"
+ ],
+ "summary": "鑾峰彇鐢熶骇杩涘害",
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/contextx.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "$ref": "#/definitions/response.ProductProgress"
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
"/v1/plcBrand/add": {
"post": {
"produces": [
@@ -391,10 +422,7 @@
"type": "object",
"properties": {
"data": {
- "type": "array",
- "items": {
- "$ref": "#/definitions/response.ProcessParams"
- }
+ "$ref": "#/definitions/response.ProcessParamsResponse"
}
}
}
@@ -462,6 +490,12 @@
"$ref": "#/definitions/common.ProcedureMaterial"
}
},
+ "nextProcedureId": {
+ "type": "string"
+ },
+ "nextProcedureName": {
+ "type": "string"
+ },
"outputMaterials": {
"description": "杈撳嚭鐗╂枡鍒楄〃",
"type": "array",
@@ -490,6 +524,17 @@
}
}
},
+ "constvar.PlcMethod": {
+ "type": "string",
+ "enum": [
+ "modbusTCP",
+ "serial"
+ ],
+ "x-enum-varnames": [
+ "PlcMethodModbusTCP",
+ "PlcMethodSerial"
+ ]
+ },
"contextx.Response": {
"type": "object",
"properties": {
@@ -506,7 +551,12 @@
"type": "object",
"properties": {
"address": {
+ "description": "PortName string ` + "`" + `gorm:\"type:varchar(191);comment:绔彛鍚嶇О\" json:\"portName\"` + "`" + `\nFrequency int ` + "`" + `gorm:\"type:int(11);comment:鏁版嵁鏇存柊棰戠巼 0-瀹炴椂鏇存柊 1-1娆�/绉抃" json:\"frequency\"` + "`" + `",
"type": "string"
+ },
+ "baudRate": {
+ "description": "涓插彛娉㈢壒鐜囷紝 method = serial鏃� 鐢�",
+ "type": "integer"
},
"brand": {
"type": "string"
@@ -517,9 +567,6 @@
"$ref": "#/definitions/model.DevicePlcAddress"
}
},
- "frequency": {
- "type": "integer"
- },
"id": {
"type": "integer"
},
@@ -527,12 +574,14 @@
"type": "boolean"
},
"method": {
- "type": "string"
+ "$ref": "#/definitions/constvar.PlcMethod"
},
"port": {
+ "description": "plc 绔彛鍙凤紝 method = modbusTCP鐢�",
"type": "integer"
},
- "portName": {
+ "serialName": {
+ "description": "涓插彛鍚嶇О锛宮ethod = serial鏃� 鐢�",
"type": "string"
}
}
@@ -542,7 +591,7 @@
"properties": {
"fieldName": {
"description": "瀵瑰簲绯荤粺瀛楁",
- "type": "string"
+ "type": "integer"
},
"length": {
"description": "鏁版嵁闀垮害",
@@ -733,7 +782,12 @@
"type": "object",
"properties": {
"address": {
+ "description": "PortName string ` + "`" + `gorm:\"type:varchar(191);comment:绔彛鍚嶇О\" json:\"portName\"` + "`" + `\nFrequency int ` + "`" + `gorm:\"type:int(11);comment:鏁版嵁鏇存柊棰戠巼 0-瀹炴椂鏇存柊 1-1娆�/绉抃" json:\"frequency\"` + "`" + `",
"type": "string"
+ },
+ "baudRate": {
+ "description": "涓插彛娉㈢壒鐜囷紝 method = serial鏃� 鐢�",
+ "type": "integer"
},
"brand": {
"type": "string"
@@ -744,9 +798,6 @@
"$ref": "#/definitions/model.DevicePlcAddress"
}
},
- "frequency": {
- "type": "integer"
- },
"id": {
"type": "integer"
},
@@ -754,12 +805,14 @@
"type": "boolean"
},
"method": {
- "type": "string"
+ "$ref": "#/definitions/constvar.PlcMethod"
},
"port": {
+ "description": "plc 绔彛鍙凤紝 method = modbusTCP鐢�",
"type": "integer"
},
- "portName": {
+ "serialName": {
+ "description": "涓插彛鍚嶇О锛宮ethod = serial鏃� 鐢�",
"type": "string"
}
}
@@ -799,6 +852,28 @@
"value": {}
}
},
+ "response.ProcessParamsResponse": {
+ "type": "object",
+ "properties": {
+ "number": {
+ "type": "string"
+ },
+ "params": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/response.ProcessParams"
+ }
+ }
+ }
+ },
+ "response.ProductProgress": {
+ "type": "object",
+ "properties": {
+ "finishNumber": {
+ "type": "integer"
+ }
+ }
+ },
"response.TaskData": {
"type": "object",
"properties": {
@@ -807,9 +882,6 @@
},
"deviceStatus": {
"type": "string"
- },
- "nextProcedure": {
- "$ref": "#/definitions/model.Procedures"
},
"order": {
"$ref": "#/definitions/model.Order"
--
Gitblit v1.8.0