From fc85945b34f5051635aacf90446e8061a683fb2f Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 15 九月 2023 14:22:53 +0800
Subject: [PATCH] plc新建连接失败记录日志

---
 docs/docs.go |  166 +++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 147 insertions(+), 19 deletions(-)

diff --git a/docs/docs.go b/docs/docs.go
index aaf2c50..2f9b1f7 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -153,7 +153,7 @@
             }
         },
         "/v1/plc/productProgress": {
-            "get": {
+            "post": {
                 "produces": [
                     "application/json"
                 ],
@@ -161,6 +161,17 @@
                     "鐢熶骇鏁伴噺"
                 ],
                 "summary": "鑾峰彇鐢熶骇杩涘害",
+                "parameters": [
+                    {
+                        "description": "鏌ヨ鍙傛暟",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/request.SendProcessParams"
+                        }
+                    }
+                ],
                 "responses": {
                     "200": {
                         "description": "鎴愬姛",
@@ -324,6 +335,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": [
@@ -361,6 +403,20 @@
                     "Task"
                 ],
                 "summary": "鑾峰彇浠诲姟",
+                "parameters": [
+                    {
+                        "type": "integer",
+                        "description": "椤电爜",
+                        "name": "page",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "姣忛〉澶у皬",
+                        "name": "pageSize",
+                        "in": "query"
+                    }
+                ],
                 "responses": {
                     "200": {
                         "description": "鎴愬姛",
@@ -383,7 +439,7 @@
                 }
             }
         },
-        "/v1/task/sendProcessParams/{id}": {
+        "/v1/task/sendProcessParams": {
             "post": {
                 "produces": [
                     "application/json"
@@ -391,14 +447,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": {
@@ -419,7 +477,7 @@
                 "tags": [
                     "Task"
                 ],
-                "summary": "浠诲姟寮�濮�",
+                "summary": "浠诲姟寮�濮嬶紙鑾峰彇宸ヨ壓鍙傛暟锛�",
                 "parameters": [
                     {
                         "type": "integer",
@@ -493,6 +551,13 @@
         "common.ProductProcedure": {
             "type": "object",
             "properties": {
+                "allProcedureNames": {
+                    "description": "鎵�灞炲伐鍗曞伐搴忓垪琛�",
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
                 "deviceId": {
                     "type": "string"
                 },
@@ -547,11 +612,15 @@
             "type": "string",
             "enum": [
                 "modbusTCP",
-                "serial"
+                "serial",
+                "缃戠粶",
+                "涓插彛"
             ],
             "x-enum-varnames": [
                 "PlcMethodModbusTCP",
-                "PlcMethodSerial"
+                "PlcMethodSerial",
+                "PlcMethodModbusTCPChinese",
+                "PlcMethodSerialChinese"
             ]
         },
         "constvar.PlcStartAddressType": {
@@ -640,6 +709,10 @@
                 },
                 "length": {
                     "description": "鏁版嵁闀垮害",
+                    "type": "integer"
+                },
+                "position": {
+                    "description": "鏁版嵁璧峰鍦板潃",
                     "type": "integer"
                 },
                 "startAddress": {
@@ -762,10 +835,12 @@
             "type": "integer",
             "enum": [
                 1,
-                2
+                2,
+                3
             ],
             "x-enum-varnames": [
-                "OrderStatusUnFinished",
+                "OrderStatusWaitProcess",
+                "OrderStatusProcessing",
                 "OrderStatusFinished"
             ]
         },
@@ -784,20 +859,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": {
@@ -807,6 +891,9 @@
                             "$ref": "#/definitions/common.ProductProcedure"
                         }
                     ]
+                },
+                "procedureId": {
+                    "type": "string"
                 },
                 "startTime": {
                     "type": "integer"
@@ -824,6 +911,20 @@
                 },
                 "name": {
                     "type": "string"
+                }
+            }
+        },
+        "request.SendProcessParams": {
+            "type": "object",
+            "required": [
+                "procedureId"
+            ],
+            "properties": {
+                "position": {
+                    "type": "integer"
+                },
+                "procedureId": {
+                    "type": "integer"
                 }
             }
         },
@@ -921,23 +1022,50 @@
                 "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"
+                "currentProcedureIndex": {
+                    "type": "integer"
                 },
                 "order": {
                     "$ref": "#/definitions/model.Order"
                 },
+                "position": {
+                    "description": "褰撳墠浠诲姟鍦ㄨ澶囩鍑犱釜浣嶇疆",
+                    "type": "integer"
+                },
                 "procedure": {
                     "$ref": "#/definitions/model.Procedures"
                 }

--
Gitblit v1.8.0