From ef7d02ce56e98e8cbc5ed6ec746ea39bf0b8c9e2 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 16 九月 2023 22:44:58 +0800
Subject: [PATCH] 增加实时获取生产进度接口
---
docs/docs.go | 445 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 406 insertions(+), 39 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 4b11609..02797c6 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,22 +123,52 @@
}
}
},
- "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": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鐢熶骇鏁伴噺"
+ ],
+ "summary": "鑾峰彇鐢熶骇杩涘害",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.SendProcessParams"
}
}
],
@@ -157,14 +184,72 @@
"type": "object",
"properties": {
"data": {
- "type": "array",
- "items": {
- "$ref": "#/definitions/response.ProcessParams"
- }
+ "$ref": "#/definitions/response.ProductProgress"
}
}
}
]
+ }
+ }
+ }
+ }
+ },
+ "/v1/plc/productProgressRealTime": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鐢熶骇鏁伴噺"
+ ],
+ "summary": "瀹炴椂鑾峰彇鐢熶骇杩涘害",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.SendProcessParams"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/contextx.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "$ref": "#/definitions/response.ProductProgress"
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/v1/plc/setProductNumber": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鐢熶骇鏁伴噺"
+ ],
+ "summary": "璁剧疆鐢熶骇鎬婚噺",
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/contextx.Response"
}
}
}
@@ -292,6 +377,37 @@
}
}
},
+ "/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"
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
"/v1/task/finish/{id}": {
"put": {
"produces": [
@@ -329,6 +445,20 @@
"Task"
],
"summary": "鑾峰彇浠诲姟",
+ "parameters": [
+ {
+ "type": "integer",
+ "description": "椤电爜",
+ "name": "page",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "姣忛〉澶у皬",
+ "name": "pageSize",
+ "in": "query"
+ }
+ ],
"responses": {
"200": {
"description": "鎴愬姛",
@@ -351,7 +481,7 @@
}
}
},
- "/v1/task/sendProcessParams/{id}": {
+ "/v1/task/sendProcessParams": {
"post": {
"produces": [
"application/json"
@@ -359,14 +489,16 @@
"tags": [
"Task"
],
- "summary": "涓嬪彂宸ヨ壓鍙傛暟",
+ "summary": "涓嬪彂宸ヨ壓鍙傛暟锛堝紑濮嬩换鍔★級",
"parameters": [
{
- "type": "integer",
- "description": "宸ュ簭id",
- "name": "id",
- "in": "path",
- "required": true
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.SendProcessParams"
+ }
}
],
"responses": {
@@ -387,7 +519,7 @@
"tags": [
"Task"
],
- "summary": "浠诲姟寮�濮�",
+ "summary": "浠诲姟寮�濮嬶紙鑾峰彇宸ヨ壓鍙傛暟锛�",
"parameters": [
{
"type": "integer",
@@ -409,10 +541,7 @@
"type": "object",
"properties": {
"data": {
- "type": "array",
- "items": {
- "$ref": "#/definitions/response.ProcessParams"
- }
+ "$ref": "#/definitions/response.ProcessParamsResponse"
}
}
}
@@ -464,6 +593,13 @@
"common.ProductProcedure": {
"type": "object",
"properties": {
+ "allProcedureNames": {
+ "description": "鎵�灞炲伐鍗曞伐搴忓垪琛�",
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
+ },
"deviceId": {
"type": "string"
},
@@ -479,6 +615,12 @@
"items": {
"$ref": "#/definitions/common.ProcedureMaterial"
}
+ },
+ "nextProcedureId": {
+ "type": "string"
+ },
+ "nextProcedureName": {
+ "type": "string"
},
"outputMaterials": {
"description": "杈撳嚭鐗╂枡鍒楄〃",
@@ -508,6 +650,43 @@
}
}
},
+ "constvar.PlcMethod": {
+ "type": "string",
+ "enum": [
+ "modbusTCP",
+ "serial",
+ "缃戠粶",
+ "涓插彛"
+ ],
+ "x-enum-varnames": [
+ "PlcMethodModbusTCP",
+ "PlcMethodSerial",
+ "PlcMethodModbusTCPChinese",
+ "PlcMethodSerialChinese"
+ ]
+ },
+ "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": {
@@ -517,6 +696,78 @@
"data": {},
"msg": {
"type": "string"
+ }
+ }
+ },
+ "model.DevicePlc": {
+ "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"
+ },
+ "details": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.DevicePlcAddress"
+ }
+ },
+ "id": {
+ "type": "integer"
+ },
+ "isOpen": {
+ "type": "boolean"
+ },
+ "method": {
+ "$ref": "#/definitions/constvar.PlcMethod"
+ },
+ "port": {
+ "description": "plc 绔彛鍙凤紝 method = modbusTCP鐢�",
+ "type": "integer"
+ },
+ "serialName": {
+ "description": "涓插彛鍚嶇О锛宮ethod = serial鏃� 鐢�",
+ "type": "string"
+ }
+ }
+ },
+ "model.DevicePlcAddress": {
+ "type": "object",
+ "properties": {
+ "fieldName": {
+ "description": "瀵瑰簲绯荤粺瀛楁",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.PlcStartAddressType"
+ }
+ ]
+ },
+ "length": {
+ "description": "鏁版嵁闀垮害",
+ "type": "integer"
+ },
+ "position": {
+ "description": "鏁版嵁璧峰鍦板潃",
+ "type": "integer"
+ },
+ "startAddress": {
+ "description": "鏁版嵁璧峰鍦板潃",
+ "type": "integer"
+ },
+ "type": {
+ "description": "鏁版嵁绫诲瀷",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.PlcStartAddressValueType"
+ }
+ ]
}
}
},
@@ -626,10 +877,12 @@
"type": "integer",
"enum": [
1,
- 2
+ 2,
+ 3
],
"x-enum-varnames": [
- "OrderStatusUnFinished",
+ "OrderStatusWaitProcess",
+ "OrderStatusProcessing",
"OrderStatusFinished"
]
},
@@ -648,20 +901,29 @@
"type": "integer",
"enum": [
1,
- 2
+ 2,
+ 3
],
"x-enum-varnames": [
- "ProcedureStatusUnFinished",
+ "ProcedureStatusWaitProcess",
+ "ProcedureStatusProcessing",
"ProcedureStatusFinished"
]
},
"model.Procedures": {
"type": "object",
"properties": {
+ "deviceId": {
+ "type": "string"
+ },
"endTime": {
"type": "integer"
},
"id": {
+ "type": "integer"
+ },
+ "position": {
+ "description": "姣忎釜璁惧鍙兘鏈夊涓満浣嶅悓鏃剁敓浜э紝鐢╬osition琛ㄧず浣嶇疆",
"type": "integer"
},
"procedure": {
@@ -671,6 +933,9 @@
"$ref": "#/definitions/common.ProductProcedure"
}
]
+ },
+ "procedureId": {
+ "type": "string"
},
"startTime": {
"type": "integer"
@@ -687,6 +952,59 @@
"type": "integer"
},
"name": {
+ "type": "string"
+ }
+ }
+ },
+ "request.SendProcessParams": {
+ "type": "object",
+ "required": [
+ "procedureId"
+ ],
+ "properties": {
+ "position": {
+ "type": "integer"
+ },
+ "procedureId": {
+ "type": "integer"
+ }
+ }
+ },
+ "request.UpdatePlc": {
+ "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"
+ },
+ "details": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.DevicePlcAddress"
+ }
+ },
+ "id": {
+ "type": "integer"
+ },
+ "isOpen": {
+ "type": "boolean"
+ },
+ "method": {
+ "$ref": "#/definitions/constvar.PlcMethod"
+ },
+ "port": {
+ "description": "plc 绔彛鍙凤紝 method = modbusTCP鐢�",
+ "type": "integer"
+ },
+ "serialName": {
+ "description": "涓插彛鍚嶇О锛宮ethod = serial鏃� 鐢�",
"type": "string"
}
}
@@ -726,21 +1044,70 @@
"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"
+ },
+ "plcStatus": {
+ "type": "integer"
+ },
+ "totalNumber": {
+ "type": "integer"
+ }
+ }
+ },
+ "response.TaskCountdown": {
+ "type": "object",
+ "properties": {
+ "countDownHour": {
+ "description": "鍊掕鏃� 鏃�",
+ "type": "integer"
+ },
+ "countDownMinute": {
+ "description": "鍊掕鏃� 鍒�",
+ "type": "integer"
+ },
+ "showCountDown": {
+ "description": "鏄惁灞曠ず鍊掕鏃�",
+ "type": "boolean"
+ }
+ }
+ },
"response.TaskData": {
"type": "object",
"properties": {
- "deviceName": {
- "type": "string"
+ "allProcedures": {
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
},
- "deviceStatus": {
- "type": "string"
- },
- "nextProcedure": {
- "$ref": "#/definitions/model.Procedures"
+ "currentProcedureIndex": {
+ "type": "integer"
},
"order": {
"$ref": "#/definitions/model.Order"
},
+ "position": {
+ "description": "褰撳墠浠诲姟鍦ㄨ澶囩鍑犱釜浣嶇疆",
+ "type": "integer"
+ },
"procedure": {
"$ref": "#/definitions/model.Procedures"
}
--
Gitblit v1.8.0