From 35fdad4e60dd7efab032ba581fd1d12c488370dd Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期五, 03 十一月 2023 10:09:54 +0800 Subject: [PATCH] update --- api/v1/plc.go | 2 +- constvar/const.go | 2 +- service/problem/check.go | 6 +++--- docs/swagger.yaml | 13 +++++++++---- docs/docs.go | 16 ++++++++++++---- docs/swagger.json | 16 ++++++++++++---- 6 files changed, 38 insertions(+), 17 deletions(-) diff --git a/api/v1/plc.go b/api/v1/plc.go index a02e6f8..650f64b 100644 --- a/api/v1/plc.go +++ b/api/v1/plc.go @@ -19,7 +19,7 @@ // @Tags 鐢熶骇鏁伴噺 // @Summary 鑾峰彇鐢熶骇杩涘害 // @Produce application/json -// @Param object body request.SendProcessParams true "鏌ヨ鍙傛暟" +// @Param object body request.GetProductProgress true "鏌ヨ鍙傛暟" // @Success 200 {object} contextx.Response{data=response.ProductProgress} "鎴愬姛" // @Router /v1/plc/productProgress [post] func (slf *PlcApi) GetProductProgress(c *gin.Context) { diff --git a/constvar/const.go b/constvar/const.go index a7e2065..8ab136b 100644 --- a/constvar/const.go +++ b/constvar/const.go @@ -105,7 +105,7 @@ ProblemCodeNetwork ProblemCode = "network" //缃戠粶閿欒 ProblemCodeDB ProblemCode = "db" //鏁版嵁搴撹繛鎺ラ敊璇� ProblemCodeSerf ProblemCode = "serf" //鏈姞鍏erf闆嗙兢 - ProblemCodeNsq ProblemCode = "nsq" //鏈繛鎺ユ秷鎭槦鍒� + ProblemCodeCloud ProblemCode = "cloud" //鏈繛鎺ヤ簯绔� ProblemCodeDevice ProblemCode = "device" //鏈粦瀹氳澶� ProblemCodeProcessModel ProblemCode = "process_model" //宸ヨ壓鍙傛暟缂哄け ProblemCodePlcConfig ProblemCode = "plc_config" //plc閰嶇疆缂哄け diff --git a/docs/docs.go b/docs/docs.go index c351c9b..df8f13f 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -229,7 +229,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/request.SendProcessParams" + "$ref": "#/definitions/request.GetProductProgress" } } ], @@ -967,7 +967,7 @@ "network", "db", "serf", - "nsq", + "cloud", "device", "process_model", "plc_config", @@ -976,10 +976,10 @@ "plc_connect" ], "x-enum-comments": { + "ProblemCodeCloud": "鏈繛鎺ヤ簯绔�", "ProblemCodeDB": "鏁版嵁搴撹繛鎺ラ敊璇�", "ProblemCodeDevice": "鏈粦瀹氳澶�", "ProblemCodeNetwork": "缃戠粶閿欒", - "ProblemCodeNsq": "鏈繛鎺ユ秷鎭槦鍒�", "ProblemCodePlcAddressList": "plc鍦板潃琛ㄧ己澶�", "ProblemCodePlcConfig": "plc閰嶇疆缂哄け", "ProblemCodePlcConnect": "plc杩炴帴澶辫触", @@ -993,7 +993,7 @@ "ProblemCodeNetwork", "ProblemCodeDB", "ProblemCodeSerf", - "ProblemCodeNsq", + "ProblemCodeCloud", "ProblemCodeDevice", "ProblemCodeProcessModel", "ProblemCodePlcConfig", @@ -1441,6 +1441,14 @@ } } }, + "request.GetProductProgress": { + "type": "object", + "properties": { + "channel": { + "type": "integer" + } + } + }, "request.QueryType": { "type": "integer", "enum": [ diff --git a/docs/swagger.json b/docs/swagger.json index 1edbac5..a341a69 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -217,7 +217,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/request.SendProcessParams" + "$ref": "#/definitions/request.GetProductProgress" } } ], @@ -955,7 +955,7 @@ "network", "db", "serf", - "nsq", + "cloud", "device", "process_model", "plc_config", @@ -964,10 +964,10 @@ "plc_connect" ], "x-enum-comments": { + "ProblemCodeCloud": "鏈繛鎺ヤ簯绔�", "ProblemCodeDB": "鏁版嵁搴撹繛鎺ラ敊璇�", "ProblemCodeDevice": "鏈粦瀹氳澶�", "ProblemCodeNetwork": "缃戠粶閿欒", - "ProblemCodeNsq": "鏈繛鎺ユ秷鎭槦鍒�", "ProblemCodePlcAddressList": "plc鍦板潃琛ㄧ己澶�", "ProblemCodePlcConfig": "plc閰嶇疆缂哄け", "ProblemCodePlcConnect": "plc杩炴帴澶辫触", @@ -981,7 +981,7 @@ "ProblemCodeNetwork", "ProblemCodeDB", "ProblemCodeSerf", - "ProblemCodeNsq", + "ProblemCodeCloud", "ProblemCodeDevice", "ProblemCodeProcessModel", "ProblemCodePlcConfig", @@ -1429,6 +1429,14 @@ } } }, + "request.GetProductProgress": { + "type": "object", + "properties": { + "channel": { + "type": "integer" + } + } + }, "request.QueryType": { "type": "integer", "enum": [ diff --git a/docs/swagger.yaml b/docs/swagger.yaml index bd4e8f1..e027ea9 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -124,7 +124,7 @@ - network - db - serf - - nsq + - cloud - device - process_model - plc_config @@ -133,10 +133,10 @@ - plc_connect type: string x-enum-comments: + ProblemCodeCloud: 鏈繛鎺ヤ簯绔� ProblemCodeDB: 鏁版嵁搴撹繛鎺ラ敊璇� ProblemCodeDevice: 鏈粦瀹氳澶� ProblemCodeNetwork: 缃戠粶閿欒 - ProblemCodeNsq: 鏈繛鎺ユ秷鎭槦鍒� ProblemCodePlcAddressList: plc鍦板潃琛ㄧ己澶� ProblemCodePlcConfig: plc閰嶇疆缂哄け ProblemCodePlcConnect: plc杩炴帴澶辫触 @@ -149,7 +149,7 @@ - ProblemCodeNetwork - ProblemCodeDB - ProblemCodeSerf - - ProblemCodeNsq + - ProblemCodeCloud - ProblemCodeDevice - ProblemCodeProcessModel - ProblemCodePlcConfig @@ -453,6 +453,11 @@ type: string updatedAt: type: string + type: object + request.GetProductProgress: + properties: + channel: + type: integer type: object request.QueryType: enum: @@ -792,7 +797,7 @@ name: object required: true schema: - $ref: '#/definitions/request.SendProcessParams' + $ref: '#/definitions/request.GetProductProgress' produces: - application/json responses: diff --git a/service/problem/check.go b/service/problem/check.go index b379b7b..baa1f25 100644 --- a/service/problem/check.go +++ b/service/problem/check.go @@ -17,7 +17,7 @@ constvar.ProblemCodeNetwork, constvar.ProblemCodeDB, constvar.ProblemCodeSerf, - constvar.ProblemCodeNsq, + constvar.ProblemCodeCloud, constvar.ProblemCodeDevice, constvar.ProblemCodeProcessModel, constvar.ProblemCodePlcConfig, @@ -30,7 +30,7 @@ constvar.ProblemCodeNetwork: "缃戠粶杩炴帴", constvar.ProblemCodeDB: "鏁版嵁搴�", constvar.ProblemCodeSerf: "serf闆嗙兢", - constvar.ProblemCodeNsq: "娑堟伅闃熷垪", + constvar.ProblemCodeCloud: "娑堟伅闃熷垪", constvar.ProblemCodeDevice: "鐢熶骇璁惧缁戝畾", constvar.ProblemCodeProcessModel: "宸ヨ壓鍙傛暟", constvar.ProblemCodePlcConfig: "plc閰嶇疆", @@ -61,7 +61,7 @@ checkObj = &DB{} case constvar.ProblemCodeSerf: checkObj = &Serf{} - case constvar.ProblemCodeNsq: + case constvar.ProblemCodeCloud: checkObj = &Nsq{} case constvar.ProblemCodeDevice: checkObj = &Device{} -- Gitblit v1.8.0