From a699ff979c84d024ca33fb1139224258f278319f Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 20 十月 2023 11:32:23 +0800
Subject: [PATCH] debug

---
 docs/docs.go |  523 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 490 insertions(+), 33 deletions(-)

diff --git a/docs/docs.go b/docs/docs.go
index b074161..5868d78 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -153,14 +153,25 @@
             }
         },
         "/v1/plc/productProgress": {
-            "get": {
+            "post": {
                 "produces": [
                     "application/json"
                 ],
                 "tags": [
-                    "鑾峰彇鍔ㄦ�佹暟鎹�"
+                    "鐢熶骇鏁伴噺"
                 ],
                 "summary": "鑾峰彇鐢熶骇杩涘害",
+                "parameters": [
+                    {
+                        "description": "鏌ヨ鍙傛暟",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/request.SendProcessParams"
+                        }
+                    }
+                ],
                 "responses": {
                     "200": {
                         "description": "鎴愬姛",
@@ -178,6 +189,56 @@
                                     }
                                 }
                             ]
+                        }
+                    }
+                }
+            }
+        },
+        "/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": [
+                    "application/json"
+                ],
+                "tags": [
+                    "鐢熶骇鏁伴噺"
+                ],
+                "summary": "璁剧疆鐢熶骇鎬婚噺",
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "$ref": "#/definitions/contextx.Response"
                         }
                     }
                 }
@@ -305,6 +366,99 @@
                 }
             }
         },
+        "/v1/processModel/list": {
+            "get": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "宸ヨ壓妯″瀷"
+                ],
+                "summary": "鑾峰彇宸ヨ壓妯″瀷鍒楄〃",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "褰撳墠姝e湪浣跨敤鐨勫伐鑹哄弬鏁扮紪鍙�",
+                        "name": "number",
+                        "in": "query",
+                        "required": true
+                    },
+                    {
+                        "type": "integer",
+                        "description": "椤电爜",
+                        "name": "page",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "姣忛〉澶у皬",
+                        "name": "pageSize",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "褰撳墠鐨勫伐搴廼d",
+                        "name": "procedureId",
+                        "in": "query",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/contextx.Response"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/definitions/model.ProcessModel"
+                                            }
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        },
+        "/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": [
@@ -342,6 +496,40 @@
                     "Task"
                 ],
                 "summary": "鑾峰彇浠诲姟",
+                "parameters": [
+                    {
+                        "type": "integer",
+                        "description": "椤电爜",
+                        "name": "page",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "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": {
                     "200": {
                         "description": "鎴愬姛",
@@ -354,7 +542,7 @@
                                     "type": "object",
                                     "properties": {
                                         "data": {
-                                            "$ref": "#/definitions/response.TaskData"
+                                            "$ref": "#/definitions/response.TaskResponse"
                                         }
                                     }
                                 }
@@ -364,7 +552,7 @@
                 }
             }
         },
-        "/v1/task/sendProcessParams/{id}": {
+        "/v1/task/sendProcessParams": {
             "post": {
                 "produces": [
                     "application/json"
@@ -372,14 +560,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": {
@@ -400,7 +590,7 @@
                 "tags": [
                     "Task"
                 ],
-                "summary": "浠诲姟寮�濮�",
+                "summary": "浠诲姟寮�濮嬶紙鑾峰彇宸ヨ壓鍙傛暟锛�",
                 "parameters": [
                     {
                         "type": "integer",
@@ -427,6 +617,36 @@
                                     }
                                 }
                             ]
+                        }
+                    }
+                }
+            }
+        },
+        "/v1/task/updateProcessParams": {
+            "post": {
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "Task"
+                ],
+                "summary": "鏇存柊宸ヨ壓鍙傛暟锛堣繘琛屼腑鐨勪换鍔★級",
+                "parameters": [
+                    {
+                        "description": "鏌ヨ鍙傛暟",
+                        "name": "object",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/request.SendProcessParams"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "鎴愬姛",
+                        "schema": {
+                            "$ref": "#/definitions/contextx.Response"
                         }
                     }
                 }
@@ -474,6 +694,17 @@
         "common.ProductProcedure": {
             "type": "object",
             "properties": {
+                "allProcedureNames": {
+                    "description": "鎵�灞炲伐鍗曞伐搴忓垪琛�",
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "channel": {
+                    "description": "閫氶亾搴忓彿",
+                    "type": "integer"
+                },
                 "deviceId": {
                     "type": "string"
                 },
@@ -489,6 +720,12 @@
                     "items": {
                         "$ref": "#/definitions/common.ProcedureMaterial"
                     }
+                },
+                "nextProcedureId": {
+                    "type": "string"
+                },
+                "nextProcedureName": {
+                    "type": "string"
                 },
                 "outputMaterials": {
                     "description": "杈撳嚭鐗╂枡鍒楄〃",
@@ -518,6 +755,72 @@
                 }
             }
         },
+        "conf.Prompt": {
+            "type": "object",
+            "properties": {
+                "plcNotConnected": {
+                    "type": "string"
+                },
+                "safeProduce": {
+                    "type": "string"
+                }
+            }
+        },
+        "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"
+            ]
+        },
+        "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": {
@@ -534,7 +837,12 @@
             "type": "object",
             "properties": {
                 "address": {
+                    "description": "PortName   string ` + "`" + `gorm:\"type:varchar(191);comment:绔彛鍚嶇О\" json:\"portName\"` + "`" + `\nFrequency  int    ` + "`" + `gorm:\"comment:鏁版嵁鏇存柊棰戠巼 0-瀹炴椂鏇存柊 1-1娆�/绉抃" json:\"frequency\"` + "`" + `",
                     "type": "string"
+                },
+                "baudRate": {
+                    "description": "涓插彛娉㈢壒鐜囷紝 method = serial鏃� 鐢�",
+                    "type": "integer"
                 },
                 "brand": {
                     "type": "string"
@@ -545,9 +853,6 @@
                         "$ref": "#/definitions/model.DevicePlcAddress"
                     }
                 },
-                "frequency": {
-                    "type": "integer"
-                },
                 "id": {
                     "type": "integer"
                 },
@@ -555,12 +860,14 @@
                     "type": "boolean"
                 },
                 "method": {
-                    "type": "string"
+                    "$ref": "#/definitions/constvar.PlcMethod"
                 },
                 "port": {
+                    "description": "plc 绔彛鍙凤紝  method =  modbusTCP鐢�",
                     "type": "integer"
                 },
-                "portName": {
+                "serialName": {
+                    "description": "涓插彛鍚嶇О锛宮ethod = serial鏃� 鐢�",
                     "type": "string"
                 }
             }
@@ -568,9 +875,17 @@
         "model.DevicePlcAddress": {
             "type": "object",
             "properties": {
+                "channel": {
+                    "description": "鏁版嵁璧峰鍦板潃",
+                    "type": "integer"
+                },
                 "fieldName": {
                     "description": "瀵瑰簲绯荤粺瀛楁",
-                    "type": "string"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/constvar.PlcStartAddressType"
+                        }
+                    ]
                 },
                 "length": {
                     "description": "鏁版嵁闀垮害",
@@ -582,7 +897,11 @@
                 },
                 "type": {
                     "description": "鏁版嵁绫诲瀷",
-                    "type": "string"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/constvar.PlcStartAddressValueType"
+                        }
+                    ]
                 }
             }
         },
@@ -692,10 +1011,12 @@
             "type": "integer",
             "enum": [
                 1,
-                2
+                2,
+                3
             ],
             "x-enum-varnames": [
-                "OrderStatusUnFinished",
+                "OrderStatusWaitProcess",
+                "OrderStatusProcessing",
                 "OrderStatusFinished"
             ]
         },
@@ -714,16 +1035,25 @@
             "type": "integer",
             "enum": [
                 1,
-                2
+                2,
+                3
             ],
             "x-enum-varnames": [
-                "ProcedureStatusUnFinished",
+                "ProcedureStatusWaitProcess",
+                "ProcedureStatusProcessing",
                 "ProcedureStatusFinished"
             ]
         },
         "model.Procedures": {
             "type": "object",
             "properties": {
+                "channel": {
+                    "description": "閫氶亾",
+                    "type": "integer"
+                },
+                "deviceId": {
+                    "type": "string"
+                },
                 "endTime": {
                     "type": "integer"
                 },
@@ -738,11 +1068,57 @@
                         }
                     ]
                 },
+                "procedureId": {
+                    "type": "string"
+                },
+                "processModelNumber": {
+                    "description": "宸ヨ壓妯″瀷缂栧彿",
+                    "type": "string"
+                },
                 "startTime": {
                     "type": "integer"
                 },
                 "status": {
                     "$ref": "#/definitions/model.ProcedureStatus"
+                }
+            }
+        },
+        "model.ProcessModel": {
+            "type": "object",
+            "properties": {
+                "deviceId": {
+                    "description": "鐢ㄤ簬杩囨护鑾峰彇nsq娑堟伅",
+                    "type": "string"
+                },
+                "isUpdate": {
+                    "description": "鍓嶇鐢�",
+                    "type": "boolean"
+                },
+                "newNumber": {
+                    "type": "string"
+                },
+                "newParamsMap": {
+                    "type": "object",
+                    "additionalProperties": true
+                },
+                "number": {
+                    "description": "宸ヨ壓妯″瀷缂栧彿",
+                    "type": "string"
+                },
+                "params": {
+                    "type": "string"
+                },
+                "paramsMap": {
+                    "type": "object",
+                    "additionalProperties": true
+                },
+                "procedure": {
+                    "description": "宸ュ簭",
+                    "type": "string"
+                },
+                "product": {
+                    "description": "浜у搧鍚嶇О",
+                    "type": "string"
                 }
             }
         },
@@ -757,11 +1133,27 @@
                 }
             }
         },
+        "request.SendProcessParams": {
+            "type": "object",
+            "required": [
+                "procedureId"
+            ],
+            "properties": {
+                "procedureId": {
+                    "type": "integer"
+                }
+            }
+        },
         "request.UpdatePlc": {
             "type": "object",
             "properties": {
                 "address": {
+                    "description": "PortName   string ` + "`" + `gorm:\"type:varchar(191);comment:绔彛鍚嶇О\" json:\"portName\"` + "`" + `\nFrequency  int    ` + "`" + `gorm:\"comment:鏁版嵁鏇存柊棰戠巼 0-瀹炴椂鏇存柊 1-1娆�/绉抃" json:\"frequency\"` + "`" + `",
                     "type": "string"
+                },
+                "baudRate": {
+                    "description": "涓插彛娉㈢壒鐜囷紝 method = serial鏃� 鐢�",
+                    "type": "integer"
                 },
                 "brand": {
                     "type": "string"
@@ -772,9 +1164,6 @@
                         "$ref": "#/definitions/model.DevicePlcAddress"
                     }
                 },
-                "frequency": {
-                    "type": "integer"
-                },
                 "id": {
                     "type": "integer"
                 },
@@ -782,12 +1171,14 @@
                     "type": "boolean"
                 },
                 "method": {
-                    "type": "string"
+                    "$ref": "#/definitions/constvar.PlcMethod"
                 },
                 "port": {
+                    "description": "plc 绔彛鍙凤紝  method =  modbusTCP鐢�",
                     "type": "integer"
                 },
-                "portName": {
+                "serialName": {
+                    "description": "涓插彛鍚嶇О锛宮ethod = serial鏃� 鐢�",
                     "type": "string"
                 }
             }
@@ -846,20 +1237,51 @@
             "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"
+                "canStarted": {
+                    "description": "鏄惁鍙互寮�濮嬬敓浜�",
+                    "type": "boolean"
                 },
-                "nextProcedure": {
-                    "$ref": "#/definitions/model.Procedures"
+                "channel": {
+                    "description": "褰撳墠浠诲姟鍦ㄨ澶囩鍑犱釜閫氶亾",
+                    "type": "integer"
+                },
+                "currentProcedureIndex": {
+                    "type": "integer"
                 },
                 "order": {
                     "$ref": "#/definitions/model.Order"
@@ -868,6 +1290,41 @@
                     "$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