From b331c9990a0396301e934daffe095f99d62d1c89 Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期三, 27 九月 2023 15:58:49 +0800 Subject: [PATCH] 任务获取修改,状态2只返回已开始和已结束的 --- docs/docs.go | 165 ++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 146 insertions(+), 19 deletions(-) diff --git a/docs/docs.go b/docs/docs.go index dc275bb..ce78968 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -194,6 +194,37 @@ } } }, + "/v1/plc/productProgressRealTime": { + "post": { + "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": [ @@ -415,6 +446,26 @@ "description": "姣忛〉澶у皬", "name": "pageSize", "in": "query" + }, + { + "enum": [ + 1, + 2, + 3 + ], + "type": "integer", + "x-enum-comments": { + "TaskModeCurrent": "鏈紑濮嬬殑鍜岃繘琛屼腑鐨�", + "TaskModeLastFinished": "涓婁竴涓粨鏉熺殑", + "TaskModeUnStarted": "鏈紑濮嬬殑" + }, + "x-enum-varnames": [ + "TaskModeUnStarted", + "TaskModeCurrent", + "TaskModeLastFinished" + ], + "name": "taskMode", + "in": "query" } ], "responses": { @@ -429,7 +480,7 @@ "type": "object", "properties": { "data": { - "$ref": "#/definitions/response.TaskData" + "$ref": "#/definitions/response.TaskResponse" } } } @@ -439,7 +490,7 @@ } } }, - "/v1/task/sendProcessParams/{id}": { + "/v1/task/sendProcessParams": { "post": { "produces": [ "application/json" @@ -558,6 +609,10 @@ "type": "string" } }, + "channel": { + "description": "閫氶亾搴忓彿", + "type": "integer" + }, "deviceId": { "type": "string" }, @@ -608,15 +663,30 @@ } } }, + "conf.Prompt": { + "type": "object", + "properties": { + "plcNotConnected": { + "type": "string" + }, + "safeProduce": { + "type": "string" + } + } + }, "constvar.PlcMethod": { "type": "string", "enum": [ "modbusTCP", - "serial" + "serial", + "缃戠粶", + "涓插彛" ], "x-enum-varnames": [ "PlcMethodModbusTCP", - "PlcMethodSerial" + "PlcMethodSerial", + "PlcMethodModbusTCPChinese", + "PlcMethodSerialChinese" ] }, "constvar.PlcStartAddressType": { @@ -641,6 +711,24 @@ "PlcStartAddressValueTypeInt" ] }, + "constvar.TaskMode": { + "type": "integer", + "enum": [ + 1, + 2, + 3 + ], + "x-enum-comments": { + "TaskModeCurrent": "鏈紑濮嬬殑鍜岃繘琛屼腑鐨�", + "TaskModeLastFinished": "涓婁竴涓粨鏉熺殑", + "TaskModeUnStarted": "鏈紑濮嬬殑" + }, + "x-enum-varnames": [ + "TaskModeUnStarted", + "TaskModeCurrent", + "TaskModeLastFinished" + ] + }, "contextx.Response": { "type": "object", "properties": { @@ -657,7 +745,7 @@ "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\"` + "`" + `", + "description": "PortName string ` + "`" + `gorm:\"type:varchar(191);comment:绔彛鍚嶇О\" json:\"portName\"` + "`" + `\nFrequency int ` + "`" + `gorm:\"comment:鏁版嵁鏇存柊棰戠巼 0-瀹炴椂鏇存柊 1-1娆�/绉抃" json:\"frequency\"` + "`" + `", "type": "string" }, "baudRate": { @@ -695,6 +783,10 @@ "model.DevicePlcAddress": { "type": "object", "properties": { + "channel": { + "description": "鏁版嵁璧峰鍦板潃", + "type": "integer" + }, "fieldName": { "description": "瀵瑰簲绯荤粺瀛楁", "allOf": [ @@ -705,10 +797,6 @@ }, "length": { "description": "鏁版嵁闀垮害", - "type": "integer" - }, - "position": { - "description": "鏁版嵁璧峰鍦板潃", "type": "integer" }, "startAddress": { @@ -867,6 +955,10 @@ "model.Procedures": { "type": "object", "properties": { + "channel": { + "description": "閫氶亾", + "type": "integer" + }, "deviceId": { "type": "string" }, @@ -874,10 +966,6 @@ "type": "integer" }, "id": { - "type": "integer" - }, - "position": { - "description": "姣忎釜璁惧鍙兘鏈夊涓満浣嶅悓鏃剁敓浜э紝鐢╬osition琛ㄧず浣嶇疆", "type": "integer" }, "procedure": { @@ -916,7 +1004,7 @@ "procedureId" ], "properties": { - "position": { + "channel": { "type": "integer" }, "procedureId": { @@ -928,7 +1016,7 @@ "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\"` + "`" + `", + "description": "PortName string ` + "`" + `gorm:\"type:varchar(191);comment:绔彛鍚嶇О\" json:\"portName\"` + "`" + `\nFrequency int ` + "`" + `gorm:\"comment:鏁版嵁鏇存柊棰戠巼 0-瀹炴椂鏇存柊 1-1娆�/绉抃" json:\"frequency\"` + "`" + `", "type": "string" }, "baudRate": { @@ -1052,20 +1140,59 @@ "type": "string" } }, + "canStarted": { + "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