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 | 854 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 757 insertions(+), 97 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 40f438e..13c6d5b 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -16,23 +16,55 @@
"host": "{{.Host}}",
"basePath": "{{.BasePath}}",
"paths": {
- "/v1/notice/task/start": {
+ "/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": [
- "Base"
+ "Config"
],
- "summary": "浠诲姟寮�鍚�氱煡",
+ "summary": "璁剧疆缃戠粶閰嶇疆",
"parameters": [
{
- "description": "鏌ヨ鍙傛暟",
+ "description": "鍙傛暟",
"name": "object",
"in": "body",
"required": true,
"schema": {
- "$ref": "#/definitions/request.TaskInfo"
+ "$ref": "#/definitions/model.NetConfig"
}
}
],
@@ -48,7 +80,349 @@
"type": "object",
"properties": {
"data": {
- "$ref": "#/definitions/response.LoginResponse"
+ "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/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/finish/{id}": {
+ "put": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "Task"
+ ],
+ "summary": "浠诲姟缁撴潫",
+ "parameters": [
+ {
+ "type": "integer",
+ "description": "宸ュ簭id",
+ "name": "id",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/contextx.Response"
+ }
+ }
+ }
+ }
+ },
+ "/v1/task/get": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "Task"
+ ],
+ "summary": "鑾峰彇浠诲姟",
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/contextx.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "$ref": "#/definitions/response.TaskData"
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/v1/task/sendProcessParams/{id}": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "Task"
+ ],
+ "summary": "涓嬪彂宸ヨ壓鍙傛暟",
+ "parameters": [
+ {
+ "type": "integer",
+ "description": "宸ュ簭id",
+ "name": "id",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/contextx.Response"
+ }
+ }
+ }
+ }
+ },
+ "/v1/task/start/{id}": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "Task"
+ ],
+ "summary": "浠诲姟寮�濮�",
+ "parameters": [
+ {
+ "type": "integer",
+ "description": "宸ュ簭id",
+ "name": "id",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/contextx.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "$ref": "#/definitions/response.ProcessParamsResponse"
}
}
}
@@ -60,23 +434,95 @@
}
},
"definitions": {
- "constvar.UserType": {
- "type": "integer",
- "enum": [
- 1,
- 2,
- 3
- ],
- "x-enum-comments": {
- "UserTypePrimary": "涓昏处鎴�",
- "UserTypeSub": "瀛愯处鎴�",
- "UserTypeSuper": "瓒呯骇绠＄悊鍛�"
- },
- "x-enum-varnames": [
- "UserTypeSuper",
- "UserTypePrimary",
- "UserTypeSub"
- ]
+ "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"
+ }
+ }
+ }
},
"contextx.Response": {
"type": "object",
@@ -90,125 +536,339 @@
}
}
},
- "model.User": {
+ "model.DevicePlc": {
"type": "object",
"properties": {
- "companyCity": {
+ "address": {
"type": "string"
},
- "companyContact": {
+ "brand": {
"type": "string"
},
- "companyEmail": {
- "type": "string"
- },
- "companyLogo": {
- "type": "string"
- },
- "companyName": {
- "type": "string"
- },
- "companyProvince": {
- "type": "string"
- },
- "companyTrade": {
- "type": "string"
- },
- "createAt": {
- "description": "鍒涘缓鏃堕棿",
- "type": "string"
- },
- "enable": {
- "type": "boolean"
- },
- "headerImage": {
- "type": "string"
- },
- "id": {
- "type": "string"
- },
- "ip": {
- "type": "string"
- },
- "menuIds": {
- "description": "鑿滃崟ID鍒楄〃",
+ "details": {
"type": "array",
"items": {
- "type": "integer"
+ "$ref": "#/definitions/model.DevicePlcAddress"
}
},
- "nickName": {
- "type": "string"
+ "frequency": {
+ "type": "integer"
},
- "parentId": {
- "type": "string"
+ "id": {
+ "type": "integer"
},
- "parentName": {
- "type": "string"
+ "isOpen": {
+ "type": "boolean"
},
- "phone": {
+ "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"
+ }
+ }
+ },
+ "model.NetConfig": {
+ "type": "object",
+ "required": [
+ "gateway",
+ "ip",
+ "mask",
+ "networkCard"
+ ],
+ "properties": {
+ "dns": {
+ "description": "dns",
"type": "string"
},
- "pos": {
+ "gateway": {
+ "description": "缃戝叧",
+ "type": "string"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "ip": {
+ "description": "鏈満ip",
+ "type": "string"
+ },
+ "mask": {
+ "description": "瀛愮綉鎺╃爜",
+ "type": "string"
+ },
+ "networkCard": {
+ "description": "缃戝崱",
"type": "string"
},
"status": {
- "type": "integer"
- },
- "systemName": {
- "type": "string"
- },
- "updateAt": {
- "description": "鏇存柊鏃堕棿",
- "type": "string"
- },
- "userType": {
- "$ref": "#/definitions/constvar.UserType"
- },
- "username": {
- "type": "string"
+ "description": "鐘舵�侊紙1鍚敤2绂佺敤锛�",
+ "allOf": [
+ {
+ "$ref": "#/definitions/model.NetConfigStatus"
+ }
+ ]
}
}
},
- "request.TaskInfo": {
+ "model.NetConfigStatus": {
+ "type": "integer",
+ "enum": [
+ 1,
+ 2
+ ],
+ "x-enum-comments": {
+ "NetConfigStatusDisabled": "鍏抽棴",
+ "NetConfigStatusEnabled": "寮�鍚�"
+ },
+ "x-enum-varnames": [
+ "NetConfigStatusEnabled",
+ "NetConfigStatusDisabled"
+ ]
+ },
+ "model.Order": {
"type": "object",
"properties": {
- "device": {
- "description": "璁惧",
+ "amount": {
+ "type": "number"
+ },
+ "customer": {
+ "type": "string"
+ },
+ "deliverDate": {
+ "type": "string"
+ },
+ "endTime": {
+ "type": "integer"
+ },
+ "orderAttr": {
+ "description": "璁㈠崟灞炴�ф嫾鎺ョ殑瀛楃涓诧紝鍗宠揣鐗╂弿杩�",
"type": "string"
},
"orderId": {
- "description": "璁㈠崟鍙�",
"type": "string"
},
- "password": {
- "description": "浜у搧",
+ "parameter": {
"type": "string"
},
- "procedure": {
- "description": "宸ュ簭",
+ "productId": {
"type": "string"
},
- "workOrder": {
- "description": "宸ュ崟",
+ "productName": {
+ "type": "string"
+ },
+ "startTime": {
+ "type": "integer"
+ },
+ "status": {
+ "$ref": "#/definitions/model.OrderStatus"
+ },
+ "unit": {
+ "type": "string"
+ },
+ "workOrderId": {
"type": "string"
}
}
},
- "response.LoginResponse": {
+ "model.OrderStatus": {
+ "type": "integer",
+ "enum": [
+ 1,
+ 2
+ ],
+ "x-enum-varnames": [
+ "OrderStatusUnFinished",
+ "OrderStatusFinished"
+ ]
+ },
+ "model.PlcBrand": {
"type": "object",
"properties": {
- "expiresAt": {
+ "id": {
"type": "integer"
},
- "token": {
+ "name": {
+ "type": "string"
+ }
+ }
+ },
+ "model.ProcedureStatus": {
+ "type": "integer",
+ "enum": [
+ 1,
+ 2
+ ],
+ "x-enum-varnames": [
+ "ProcedureStatusUnFinished",
+ "ProcedureStatusFinished"
+ ]
+ },
+ "model.Procedures": {
+ "type": "object",
+ "properties": {
+ "endTime": {
+ "type": "integer"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "procedure": {
+ "description": "common.ProductProcedure 瀵硅薄",
+ "allOf": [
+ {
+ "$ref": "#/definitions/common.ProductProcedure"
+ }
+ ]
+ },
+ "startTime": {
+ "type": "integer"
+ },
+ "status": {
+ "$ref": "#/definitions/model.ProcedureStatus"
+ }
+ }
+ },
+ "request.AddPlcBrand": {
+ "type": "object",
+ "properties": {
+ "id": {
+ "type": "integer"
+ },
+ "name": {
+ "type": "string"
+ }
+ }
+ },
+ "request.UpdatePlc": {
+ "type": "object",
+ "properties": {
+ "address": {
"type": "string"
},
- "user": {
- "$ref": "#/definitions/model.User"
+ "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": {
+ "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"
+ }
+ }
+ },
+ "response.TaskData": {
+ "type": "object",
+ "properties": {
+ "deviceName": {
+ "type": "string"
+ },
+ "deviceStatus": {
+ "type": "string"
+ },
+ "order": {
+ "$ref": "#/definitions/model.Order"
+ },
+ "procedure": {
+ "$ref": "#/definitions/model.Procedures"
}
}
}
--
Gitblit v1.8.0