From cf96f6bc1fb484fde16bd5ed6d49534c96958022 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 25 九月 2023 15:43:12 +0800
Subject: [PATCH] fix
---
docs/docs.go | 75 ++++++++++++++++++++++++++++++-------
1 files changed, 61 insertions(+), 14 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 87355c3..1ce5044 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -460,7 +460,7 @@
"type": "object",
"properties": {
"data": {
- "$ref": "#/definitions/response.TaskData"
+ "$ref": "#/definitions/response.TaskResponse"
}
}
}
@@ -634,6 +634,10 @@
"type": "string"
}
},
+ "channel": {
+ "description": "閫氶亾搴忓彿",
+ "type": "integer"
+ },
"deviceId": {
"type": "string"
},
@@ -681,6 +685,14 @@
"items": {
"$ref": "#/definitions/common.ProcedureWorker"
}
+ }
+ }
+ },
+ "conf.Prompt": {
+ "type": "object",
+ "properties": {
+ "safeProduce": {
+ "type": "string"
}
}
},
@@ -775,6 +787,10 @@
"model.DevicePlcAddress": {
"type": "object",
"properties": {
+ "channel": {
+ "description": "鏁版嵁璧峰鍦板潃",
+ "type": "integer"
+ },
"fieldName": {
"description": "瀵瑰簲绯荤粺瀛楁",
"allOf": [
@@ -785,10 +801,6 @@
},
"length": {
"description": "鏁版嵁闀垮害",
- "type": "integer"
- },
- "position": {
- "description": "鏁版嵁璧峰鍦板潃",
"type": "integer"
},
"startAddress": {
@@ -947,6 +959,10 @@
"model.Procedures": {
"type": "object",
"properties": {
+ "channel": {
+ "description": "閫氶亾",
+ "type": "integer"
+ },
"deviceId": {
"type": "string"
},
@@ -954,10 +970,6 @@
"type": "integer"
},
"id": {
- "type": "integer"
- },
- "position": {
- "description": "姣忎釜璁惧鍙兘鏈夊涓満浣嶅悓鏃剁敓浜э紝鐢╬osition琛ㄧず浣嶇疆",
"type": "integer"
},
"procedure": {
@@ -996,7 +1008,7 @@
"procedureId"
],
"properties": {
- "position": {
+ "channel": {
"type": "integer"
},
"procedureId": {
@@ -1136,20 +1148,55 @@
"description": "鏄惁鍙互寮�濮嬬敓浜�",
"type": "boolean"
},
+ "channel": {
+ "description": "褰撳墠浠诲姟鍦ㄨ澶囩鍑犱釜閫氶亾",
+ "type": "integer"
+ },
"currentProcedureIndex": {
"type": "integer"
},
"order": {
"$ref": "#/definitions/model.Order"
},
- "position": {
- "description": "褰撳墠浠诲姟鍦ㄨ澶囩鍑犱釜浣嶇疆",
- "type": "integer"
- },
"procedure": {
"$ref": "#/definitions/model.Procedures"
}
}
+ },
+ "response.TaskResponse": {
+ "type": "object",
+ "properties": {
+ "channelAmount": {
+ "description": "閫氶亾鏁伴噺",
+ "type": "integer"
+ },
+ "prompt": {
+ "description": "鎻愮ず璇�",
+ "allOf": [
+ {
+ "$ref": "#/definitions/conf.Prompt"
+ }
+ ]
+ },
+ "taskCount": {
+ "description": "浠诲姟鏁伴噺",
+ "type": "integer"
+ },
+ "tasks": {
+ "description": "浠诲姟鍒楄〃",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/response.TaskData"
+ }
+ },
+ "workers": {
+ "description": "浜哄憳鍒楄〃",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/common.ProcedureWorker"
+ }
+ }
+ }
}
}
}`
--
Gitblit v1.8.0