From 14fc2f577e2c0b7b146c1a430e9438f317ad5b0c Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 23 九月 2023 14:14:27 +0800
Subject: [PATCH] 任务接收增加channel字段，postion字段改为channel
---
docs/docs.go | 124 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 117 insertions(+), 7 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 6c17dbd..b41553d 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -153,7 +153,7 @@
}
},
"/v1/plc/productProgress": {
- "get": {
+ "post": {
"produces": [
"application/json"
],
@@ -172,6 +172,37 @@
}
}
],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/contextx.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "$ref": "#/definitions/response.ProductProgress"
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/v1/plc/productProgressRealTime": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鐢熶骇鏁伴噺"
+ ],
+ "summary": "瀹炴椂鑾峰彇鐢熶骇杩涘害",
"responses": {
"200": {
"description": "鎴愬姛",
@@ -439,7 +470,52 @@
}
}
},
- "/v1/task/sendProcessParams/{id}": {
+ "/v1/task/get/unStarted": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "Task"
+ ],
+ "summary": "鑾峰彇鏈紑濮嬬殑浠诲姟",
+ "parameters": [
+ {
+ "type": "integer",
+ "description": "椤电爜",
+ "name": "page",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "姣忛〉澶у皬",
+ "name": "pageSize",
+ "in": "query"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/contextx.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "$ref": "#/definitions/response.TaskData"
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/v1/task/sendProcessParams": {
"post": {
"produces": [
"application/json"
@@ -551,6 +627,17 @@
"common.ProductProcedure": {
"type": "object",
"properties": {
+ "allProcedureNames": {
+ "description": "鎵�灞炲伐鍗曞伐搴忓垪琛�",
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
+ },
+ "channel": {
+ "description": "閫氶亾搴忓彿",
+ "type": "integer"
+ },
"deviceId": {
"type": "string"
},
@@ -605,11 +692,15 @@
"type": "string",
"enum": [
"modbusTCP",
- "serial"
+ "serial",
+ "缃戠粶",
+ "涓插彛"
],
"x-enum-varnames": [
"PlcMethodModbusTCP",
- "PlcMethodSerial"
+ "PlcMethodSerial",
+ "PlcMethodModbusTCPChinese",
+ "PlcMethodSerialChinese"
]
},
"constvar.PlcStartAddressType": {
@@ -650,7 +741,7 @@
"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\"` + "`" + `",
+ "description": "PortName string ` + "`" + `gorm:\"type:varchar(191);comment:绔彛鍚嶇О\" json:\"portName\"` + "`" + `\nFrequency int ` + "`" + `gorm:\"comment:鏁版嵁鏇存柊棰戠巼 0-瀹炴椂鏇存柊 1-1娆�/绉抃" json:\"frequency\"` + "`" + `",
"type": "string"
},
"baudRate": {
@@ -688,6 +779,10 @@
"model.DevicePlcAddress": {
"type": "object",
"properties": {
+ "channel": {
+ "description": "鏁版嵁璧峰鍦板潃",
+ "type": "integer"
+ },
"fieldName": {
"description": "瀵瑰簲绯荤粺瀛楁",
"allOf": [
@@ -856,6 +951,10 @@
"model.Procedures": {
"type": "object",
"properties": {
+ "channel": {
+ "description": "閫氶亾",
+ "type": "integer"
+ },
"deviceId": {
"type": "string"
},
@@ -901,7 +1000,7 @@
"procedureId"
],
"properties": {
- "position": {
+ "channel": {
"type": "integer"
},
"procedureId": {
@@ -913,7 +1012,7 @@
"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\"` + "`" + `",
+ "description": "PortName string ` + "`" + `gorm:\"type:varchar(191);comment:绔彛鍚嶇О\" json:\"portName\"` + "`" + `\nFrequency int ` + "`" + `gorm:\"comment:鏁版嵁鏇存柊棰戠巼 0-瀹炴椂鏇存柊 1-1娆�/绉抃" json:\"frequency\"` + "`" + `",
"type": "string"
},
"baudRate": {
@@ -1003,6 +1102,9 @@
"finishNumber": {
"type": "integer"
},
+ "plcStatus": {
+ "type": "integer"
+ },
"totalNumber": {
"type": "integer"
}
@@ -1034,6 +1136,14 @@
"type": "string"
}
},
+ "canStarted": {
+ "description": "鏄惁鍙互寮�濮嬬敓浜�",
+ "type": "boolean"
+ },
+ "channel": {
+ "description": "褰撳墠浠诲姟鍦ㄨ澶囩鍑犱釜閫氶亾",
+ "type": "integer"
+ },
"currentProcedureIndex": {
"type": "integer"
},
--
Gitblit v1.8.0