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 | 835 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 770 insertions(+), 65 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 825f266..486c228 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -16,6 +16,345 @@
"host": "{{.Host}}",
"basePath": "{{.BasePath}}",
"paths": {
+ "/v1/config/net": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "Config"
+ ],
+ "summary": "鑾峰彇缃戠粶閰嶇疆",
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/contextx.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.NetConfig"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ },
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "Config"
+ ],
+ "summary": "璁剧疆缃戠粶閰嶇疆",
+ "parameters": [
+ {
+ "description": "鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/model.NetConfig"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/contextx.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/response.ProcessParams"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/v1/config/plc": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "Config"
+ ],
+ "summary": "鑾峰彇plc閰嶇疆",
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/contextx.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "$ref": "#/definitions/model.DevicePlc"
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ },
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "Config"
+ ],
+ "summary": "鏇存柊plc閰嶇疆",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$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": "鎴愬姛",
+ "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"
+ }
+ }
+ }
+ }
+ },
+ "/v1/plcBrand/add": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "plc鍝佺墝"
+ ],
+ "summary": "娣诲姞plc鍝佺墝",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.AddPlcBrand"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/contextx.Response"
+ }
+ }
+ }
+ }
+ },
+ "/v1/plcBrand/delete/{id}": {
+ "delete": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "plc鍝佺墝"
+ ],
+ "summary": "鍒犻櫎plc鍝佺墝",
+ "parameters": [
+ {
+ "type": "integer",
+ "description": "鏌ヨ鍙傛暟",
+ "name": "id",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "$ref": "#/definitions/contextx.Response"
+ }
+ }
+ }
+ }
+ },
+ "/v1/plcBrand/list": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "plc鍝佺墝"
+ ],
+ "summary": "鑾峰彇plc鍝佺墝鍒楄〃",
+ "responses": {
+ "200": {
+ "description": "OK",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/response.ListResponse"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.PlcBrand"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/v1/plcBrand/update": {
+ "put": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "plc鍝佺墝"
+ ],
+ "summary": "鏇存柊plc鍝佺墝",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.UpdatePlcBrand"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "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"
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
"/v1/task/finish/{id}": {
"put": {
"produces": [
@@ -125,7 +464,19 @@
"200": {
"description": "鎴愬姛",
"schema": {
- "$ref": "#/definitions/contextx.Response"
+ "allOf": [
+ {
+ "$ref": "#/definitions/contextx.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "$ref": "#/definitions/response.ProcessParamsResponse"
+ }
+ }
+ }
+ ]
}
}
}
@@ -133,6 +484,129 @@
}
},
"definitions": {
+ "common.ProcedureMaterial": {
+ "type": "object",
+ "properties": {
+ "amount": {
+ "type": "number"
+ },
+ "materialId": {
+ "type": "string"
+ },
+ "materialName": {
+ "type": "string"
+ },
+ "unit": {
+ "type": "string"
+ }
+ }
+ },
+ "common.ProcedureWorker": {
+ "type": "object",
+ "properties": {
+ "endTime": {
+ "type": "integer"
+ },
+ "phoneNum": {
+ "type": "string"
+ },
+ "startTime": {
+ "type": "integer"
+ },
+ "workerId": {
+ "type": "string"
+ },
+ "workerName": {
+ "type": "string"
+ }
+ }
+ },
+ "common.ProductProcedure": {
+ "type": "object",
+ "properties": {
+ "deviceId": {
+ "type": "string"
+ },
+ "deviceName": {
+ "type": "string"
+ },
+ "endTime": {
+ "type": "integer"
+ },
+ "inputMaterials": {
+ "description": "杈撳叆鐗╂枡鍒楄〃",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/common.ProcedureMaterial"
+ }
+ },
+ "nextProcedureId": {
+ "type": "string"
+ },
+ "nextProcedureName": {
+ "type": "string"
+ },
+ "outputMaterials": {
+ "description": "杈撳嚭鐗╂枡鍒楄〃",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/common.ProcedureMaterial"
+ }
+ },
+ "procedureId": {
+ "type": "string"
+ },
+ "procedureName": {
+ "type": "string"
+ },
+ "startTime": {
+ "type": "integer"
+ },
+ "workHours": {
+ "type": "number"
+ },
+ "workers": {
+ "description": "浜哄憳鍒楄〃",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/common.ProcedureWorker"
+ }
+ }
+ }
+ },
+ "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": {
@@ -144,6 +618,131 @@
"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"
+ },
+ "startAddress": {
+ "description": "鏁版嵁璧峰鍦板潃",
+ "type": "integer"
+ },
+ "type": {
+ "description": "鏁版嵁绫诲瀷",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.PlcStartAddressValueType"
+ }
+ ]
+ }
+ }
+ },
+ "model.NetConfig": {
+ "type": "object",
+ "required": [
+ "gateway",
+ "ip",
+ "mask",
+ "networkCard"
+ ],
+ "properties": {
+ "dns": {
+ "description": "dns",
+ "type": "string"
+ },
+ "gateway": {
+ "description": "缃戝叧",
+ "type": "string"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "ip": {
+ "description": "鏈満ip",
+ "type": "string"
+ },
+ "mask": {
+ "description": "瀛愮綉鎺╃爜",
+ "type": "string"
+ },
+ "networkCard": {
+ "description": "缃戝崱",
+ "type": "string"
+ },
+ "status": {
+ "description": "鐘舵�侊紙1鍚敤2绂佺敤锛�",
+ "allOf": [
+ {
+ "$ref": "#/definitions/model.NetConfigStatus"
+ }
+ ]
+ }
+ }
+ },
+ "model.NetConfigStatus": {
+ "type": "integer",
+ "enum": [
+ 1,
+ 2
+ ],
+ "x-enum-comments": {
+ "NetConfigStatusDisabled": "鍏抽棴",
+ "NetConfigStatusEnabled": "寮�鍚�"
+ },
+ "x-enum-varnames": [
+ "NetConfigStatusEnabled",
+ "NetConfigStatusDisabled"
+ ]
},
"model.Order": {
"type": "object",
@@ -179,105 +778,211 @@
"startTime": {
"type": "integer"
},
+ "status": {
+ "$ref": "#/definitions/model.OrderStatus"
+ },
"unit": {
+ "type": "string"
+ },
+ "workOrderId": {
"type": "string"
}
}
},
- "model.Procedures": {
+ "model.OrderStatus": {
+ "type": "integer",
+ "enum": [
+ 1,
+ 2
+ ],
+ "x-enum-varnames": [
+ "OrderStatusUnFinished",
+ "OrderStatusFinished"
+ ]
+ },
+ "model.PlcBrand": {
"type": "object",
"properties": {
"id": {
"type": "integer"
},
- "procedure": {
- "description": "request.ProductProcedure 瀵硅薄",
- "allOf": [
- {
- "$ref": "#/definitions/request.ProductProcedure"
- }
- ]
- }
- }
- },
- "request.ProcedureMaterial": {
- "type": "object",
- "properties": {
- "amount": {
- "type": "number"
- },
- "materialId": {
- "type": "string"
- },
- "materialName": {
- "type": "string"
- },
- "unit": {
+ "name": {
"type": "string"
}
}
},
- "request.ProcedureWorker": {
- "type": "object",
- "properties": {
- "phoneNum": {
- "type": "string"
- },
- "workerId": {
- "type": "string"
- },
- "workerName": {
- "type": "string"
- }
- }
+ "model.ProcedureStatus": {
+ "type": "integer",
+ "enum": [
+ 1,
+ 2
+ ],
+ "x-enum-varnames": [
+ "ProcedureStatusUnFinished",
+ "ProcedureStatusFinished"
+ ]
},
- "request.ProductProcedure": {
+ "model.Procedures": {
"type": "object",
"properties": {
- "deviceId": {
- "type": "string"
- },
"endTime": {
"type": "integer"
},
- "inputMaterials": {
- "description": "杈撳叆鐗╂枡鍒楄〃",
- "type": "array",
- "items": {
- "$ref": "#/definitions/request.ProcedureMaterial"
- }
+ "id": {
+ "type": "integer"
},
- "outputMaterials": {
- "description": "杈撳嚭鐗╂枡鍒楄〃",
- "type": "array",
- "items": {
- "$ref": "#/definitions/request.ProcedureMaterial"
- }
- },
- "procedureId": {
- "type": "string"
- },
- "procedureName": {
- "type": "string"
+ "procedure": {
+ "description": "common.ProductProcedure 瀵硅薄",
+ "allOf": [
+ {
+ "$ref": "#/definitions/common.ProductProcedure"
+ }
+ ]
},
"startTime": {
"type": "integer"
},
- "workHours": {
- "type": "number"
+ "status": {
+ "$ref": "#/definitions/model.ProcedureStatus"
+ }
+ }
+ },
+ "request.AddPlcBrand": {
+ "type": "object",
+ "properties": {
+ "id": {
+ "type": "integer"
},
- "workers": {
- "description": "浜哄憳鍒楄〃",
+ "name": {
+ "type": "string"
+ }
+ }
+ },
+ "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/request.ProcedureWorker"
+ "$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"
+ }
+ }
+ },
+ "request.UpdatePlcBrand": {
+ "type": "object",
+ "properties": {
+ "id": {
+ "type": "integer"
+ },
+ "name": {
+ "type": "string"
+ }
+ }
+ },
+ "response.ListResponse": {
+ "type": "object",
+ "properties": {
+ "code": {
+ "type": "integer"
+ },
+ "count": {
+ "type": "integer"
+ },
+ "data": {},
+ "msg": {
+ "type": "string"
+ }
+ }
+ },
+ "response.ProcessParams": {
+ "type": "object",
+ "properties": {
+ "key": {
+ "type": "string"
+ },
+ "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"
+ },
+ "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"
+ },
+ "deviceStatus": {
+ "type": "string"
+ },
"order": {
"$ref": "#/definitions/model.Order"
},
--
Gitblit v1.8.0