From 06cff5f59c72d36b745515d98b9e645e92bb91a3 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 23 八月 2023 20:14:23 +0800
Subject: [PATCH] 修改获取工艺参数等待超时，修改生产进度返回值参数
---
docs/docs.go | 172 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 149 insertions(+), 23 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 4b11609..13c6d5b 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -16,7 +16,7 @@
"host": "{{.Host}}",
"basePath": "{{.BasePath}}",
"paths": {
- "/v1/cc/nn": {
+ "/v1/config/net": {
"get": {
"produces": [
"application/json"
@@ -49,7 +49,7 @@
}
}
},
- "put": {
+ "post": {
"produces": [
"application/json"
],
@@ -93,7 +93,7 @@
}
}
},
- "/v1/config/net": {
+ "/v1/config/plc": {
"get": {
"produces": [
"application/json"
@@ -101,7 +101,7 @@
"tags": [
"Config"
],
- "summary": "鑾峰彇缃戠粶閰嶇疆",
+ "summary": "鑾峰彇plc閰嶇疆",
"responses": {
"200": {
"description": "鎴愬姛",
@@ -114,10 +114,7 @@
"type": "object",
"properties": {
"data": {
- "type": "array",
- "items": {
- "$ref": "#/definitions/model.NetConfig"
- }
+ "$ref": "#/definitions/model.DevicePlc"
}
}
}
@@ -126,25 +123,44 @@
}
}
},
- "put": {
+ "post": {
"produces": [
"application/json"
],
"tags": [
"Config"
],
- "summary": "璁剧疆缃戠粶閰嶇疆",
+ "summary": "鏇存柊plc閰嶇疆",
"parameters": [
{
- "description": "鍙傛暟",
+ "description": "鏌ヨ鍙傛暟",
"name": "object",
"in": "body",
"required": true,
"schema": {
- "$ref": "#/definitions/model.NetConfig"
+ "$ref": "#/definitions/request.UpdatePlc"
}
}
],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/contextx.Response"
+ }
+ }
+ }
+ }
+ },
+ "/v1/plc/productProgress": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鑾峰彇鍔ㄦ�佹暟鎹�"
+ ],
+ "summary": "鑾峰彇鐢熶骇杩涘害",
"responses": {
"200": {
"description": "鎴愬姛",
@@ -157,10 +173,7 @@
"type": "object",
"properties": {
"data": {
- "type": "array",
- "items": {
- "$ref": "#/definitions/response.ProcessParams"
- }
+ "$ref": "#/definitions/response.ProductProgress"
}
}
}
@@ -409,10 +422,7 @@
"type": "object",
"properties": {
"data": {
- "type": "array",
- "items": {
- "$ref": "#/definitions/response.ProcessParams"
- }
+ "$ref": "#/definitions/response.ProcessParamsResponse"
}
}
}
@@ -480,6 +490,12 @@
"$ref": "#/definitions/common.ProcedureMaterial"
}
},
+ "nextProcedureId": {
+ "type": "string"
+ },
+ "nextProcedureName": {
+ "type": "string"
+ },
"outputMaterials": {
"description": "杈撳嚭鐗╂枡鍒楄〃",
"type": "array",
@@ -516,6 +532,62 @@
},
"data": {},
"msg": {
+ "type": "string"
+ }
+ }
+ },
+ "model.DevicePlc": {
+ "type": "object",
+ "properties": {
+ "address": {
+ "type": "string"
+ },
+ "brand": {
+ "type": "string"
+ },
+ "details": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.DevicePlcAddress"
+ }
+ },
+ "frequency": {
+ "type": "integer"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "isOpen": {
+ "type": "boolean"
+ },
+ "method": {
+ "type": "string"
+ },
+ "port": {
+ "type": "integer"
+ },
+ "portName": {
+ "type": "string"
+ }
+ }
+ },
+ "model.DevicePlcAddress": {
+ "type": "object",
+ "properties": {
+ "fieldName": {
+ "description": "瀵瑰簲绯荤粺瀛楁",
+ "type": "integer"
+ },
+ "length": {
+ "description": "鏁版嵁闀垮害",
+ "type": "integer"
+ },
+ "startAddress": {
+ "description": "鏁版嵁璧峰鍦板潃",
+ "type": "integer"
+ },
+ "type": {
+ "description": "鏁版嵁绫诲瀷",
"type": "string"
}
}
@@ -691,6 +763,41 @@
}
}
},
+ "request.UpdatePlc": {
+ "type": "object",
+ "properties": {
+ "address": {
+ "type": "string"
+ },
+ "brand": {
+ "type": "string"
+ },
+ "details": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.DevicePlcAddress"
+ }
+ },
+ "frequency": {
+ "type": "integer"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "isOpen": {
+ "type": "boolean"
+ },
+ "method": {
+ "type": "string"
+ },
+ "port": {
+ "type": "integer"
+ },
+ "portName": {
+ "type": "string"
+ }
+ }
+ },
"request.UpdatePlcBrand": {
"type": "object",
"properties": {
@@ -726,6 +833,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": {
@@ -734,9 +863,6 @@
},
"deviceStatus": {
"type": "string"
- },
- "nextProcedure": {
- "$ref": "#/definitions/model.Procedures"
},
"order": {
"$ref": "#/definitions/model.Order"
--
Gitblit v1.8.0