From b555874608be2e4bb40cceba60b497c04caef842 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 12 九月 2023 14:17:51 +0800
Subject: [PATCH] 三菱协议更改
---
docs/docs.go | 145 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 132 insertions(+), 13 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index b32229d..486c228 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -158,7 +158,7 @@
"application/json"
],
"tags": [
- "鑾峰彇鍔ㄦ�佹暟鎹�"
+ "鐢熶骇鏁伴噺"
],
"summary": "鑾峰彇鐢熶骇杩涘害",
"responses": {
@@ -178,6 +178,25 @@
}
}
]
+ }
+ }
+ }
+ }
+ },
+ "/v1/plc/setProductNumber": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鐢熶骇鏁伴噺"
+ ],
+ "summary": "璁剧疆鐢熶骇鎬婚噺",
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/contextx.Response"
}
}
}
@@ -300,6 +319,37 @@
"description": "OK",
"schema": {
"$ref": "#/definitions/contextx.Response"
+ }
+ }
+ }
+ }
+ },
+ "/v1/task/countdown": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "Task"
+ ],
+ "summary": "鏂颁换鍔″�掕鏃�",
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/contextx.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "$ref": "#/definitions/response.TaskCountdown"
+ }
+ }
+ }
+ ]
}
}
}
@@ -524,6 +574,39 @@
}
}
},
+ "constvar.PlcMethod": {
+ "type": "string",
+ "enum": [
+ "modbusTCP",
+ "serial"
+ ],
+ "x-enum-varnames": [
+ "PlcMethodModbusTCP",
+ "PlcMethodSerial"
+ ]
+ },
+ "constvar.PlcStartAddressType": {
+ "type": "integer",
+ "enum": [
+ 1,
+ 2
+ ],
+ "x-enum-varnames": [
+ "PlcStartAddressTypeFinishNumber",
+ "PlcStartAddressTypeTotalNumber"
+ ]
+ },
+ "constvar.PlcStartAddressValueType": {
+ "type": "string",
+ "enum": [
+ "string",
+ "int"
+ ],
+ "x-enum-varnames": [
+ "PlcStartAddressValueTypeString",
+ "PlcStartAddressValueTypeInt"
+ ]
+ },
"contextx.Response": {
"type": "object",
"properties": {
@@ -540,7 +623,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"
@@ -551,9 +639,6 @@
"$ref": "#/definitions/model.DevicePlcAddress"
}
},
- "frequency": {
- "type": "integer"
- },
"id": {
"type": "integer"
},
@@ -561,12 +646,14 @@
"type": "boolean"
},
"method": {
- "type": "string"
+ "$ref": "#/definitions/constvar.PlcMethod"
},
"port": {
+ "description": "plc 绔彛鍙凤紝 method = modbusTCP鐢�",
"type": "integer"
},
- "portName": {
+ "serialName": {
+ "description": "涓插彛鍚嶇О锛宮ethod = serial鏃� 鐢�",
"type": "string"
}
}
@@ -576,7 +663,11 @@
"properties": {
"fieldName": {
"description": "瀵瑰簲绯荤粺瀛楁",
- "type": "string"
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.PlcStartAddressType"
+ }
+ ]
},
"length": {
"description": "鏁版嵁闀垮害",
@@ -588,7 +679,11 @@
},
"type": {
"description": "鏁版嵁绫诲瀷",
- "type": "string"
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.PlcStartAddressValueType"
+ }
+ ]
}
}
},
@@ -767,7 +862,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"
@@ -778,9 +878,6 @@
"$ref": "#/definitions/model.DevicePlcAddress"
}
},
- "frequency": {
- "type": "integer"
- },
"id": {
"type": "integer"
},
@@ -788,12 +885,14 @@
"type": "boolean"
},
"method": {
- "type": "string"
+ "$ref": "#/definitions/constvar.PlcMethod"
},
"port": {
+ "description": "plc 绔彛鍙凤紝 method = modbusTCP鐢�",
"type": "integer"
},
- "portName": {
+ "serialName": {
+ "description": "涓插彛鍚嶇О锛宮ethod = serial鏃� 鐢�",
"type": "string"
}
}
@@ -852,6 +951,26 @@
"properties": {
"finishNumber": {
"type": "integer"
+ },
+ "totalNumber": {
+ "type": "integer"
+ }
+ }
+ },
+ "response.TaskCountdown": {
+ "type": "object",
+ "properties": {
+ "countDownHour": {
+ "description": "鍊掕鏃� 鏃�",
+ "type": "integer"
+ },
+ "countDownMinute": {
+ "description": "鍊掕鏃� 鍒�",
+ "type": "integer"
+ },
+ "showCountDown": {
+ "description": "鏄惁灞曠ず鍊掕鏃�",
+ "type": "boolean"
}
}
},
--
Gitblit v1.8.0