From f2d6737b28cbe6fe3087b9b6abded72ce8e5e466 Mon Sep 17 00:00:00 2001 From: xzb <223@qq.com> Date: Tue, 31 Oct 2023 16:46:14 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E7=90=86=E5=8C=BA=E6=AE=B5-=E9=9B=86?= =?UTF-8?q?=E4=B8=AD=E7=AB=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/docs.go | 126 ++++++++++------------------------------------ docs/swagger.json | 126 ++++++++++------------------------------------ docs/swagger.yaml | 87 +++++++++----------------------- 3 files changed, 77 insertions(+), 262 deletions(-) diff --git a/docs/docs.go b/docs/docs.go index ea44bfd..bcea4a8 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -3130,58 +3130,6 @@ const docTemplate = `{ } } }, - "/api/v1/simulation/axle/operation": { - "post": { - "security": [ - { - "JwtAuth": [] - } - ], - "description": "ATS测试-计轴操作", - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "tags": [ - "ATS测试仿真Api" - ], - "summary": "ATS测试-计轴操作", - "parameters": [ - { - "type": "string", - "description": "JWT Token", - "name": "Authorization", - "in": "header", - "required": true - }, - { - "description": "ATS测试仿真-操作计轴", - "name": "AxleOperationReqDto", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/dto.AxleOperationReqDto" - } - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "type": "string" - } - }, - "500": { - "description": "Internal Server Error", - "schema": { - "$ref": "#/definitions/dto.ErrorDto" - } - } - } - } - }, "/api/v1/simulation/axleSection/operation": { "post": { "security": [ @@ -5290,32 +5238,6 @@ const docTemplate = `{ } } }, - "dto.AxleOperationReqDto": { - "type": "object", - "required": [ - "id", - "mapId", - "simulationId" - ], - "properties": { - "id": { - "type": "string" - }, - "mapId": { - "type": "integer" - }, - "operation": { - "$ref": "#/definitions/request_proto.Section_AxleOperation" - }, - "reset": { - "description": "当操作为直接复位或预复位时有效，true-复位，false-取消或结束复位", - "type": "boolean" - }, - "simulationId": { - "type": "string" - } - } - }, "dto.AxleSectionOperationReqDto": { "type": "object", "required": [ @@ -5331,7 +5253,7 @@ const docTemplate = `{ "type": "integer" }, "operation": { - "$ref": "#/definitions/request_proto.Section_SectionOperation" + "$ref": "#/definitions/request_proto.Section_Operation" }, "simulationId": { "type": "string" @@ -6092,32 +6014,29 @@ const docTemplate = `{ } } }, - "request_proto.Section_AxleOperation": { + "request_proto.Section_Operation": { "type": "integer", "enum": [ 0, - 1 - ], - "x-enum-comments": { - "Section_Drst": "设置计轴直接复位", - "Section_Pdrst": "设置计轴预复位" - }, - "x-enum-varnames": [ - "Section_Drst", - "Section_Pdrst" - ] - }, - "request_proto.Section_SectionOperation": { - "type": "integer", - "enum": [ - 0, - 1 + 1, + 2, + 3, + 4, + 5 ], "x-enum-comments": { + "Section_CancelDrst": "取消计轴直接复位", "Section_CancelFaultOcc": "取消故障占用", - "Section_SetFaultOcc": "设置故障占用" + "Section_CancelPdrst": "取消计轴预复位", + "Section_SetDrst": "设置计轴直接复位", + "Section_SetFaultOcc": "设置故障占用", + "Section_SetPdrst": "设置计轴预复位" }, "x-enum-varnames": [ + "Section_SetDrst", + "Section_CancelDrst", + "Section_SetPdrst", + "Section_CancelPdrst", "Section_SetFaultOcc", "Section_CancelFaultOcc" ] @@ -6203,15 +6122,21 @@ const docTemplate = `{ 5, 6, 7, - 8 + 8, + 9, + 10, + 11 ], "x-enum-comments": { "Turnout_CancelDC": "取消定操", "Turnout_CancelFC": "取消反操", + "Turnout_CancelForce": "取消强制", "Turnout_CancelJC": "取消挤岔故障", "Turnout_CancelSB": "取消失表故障", "Turnout_DC": "定操", "Turnout_FC": "反操", + "Turnout_ForceDw": "强制定位", + "Turnout_ForceFw": "强制反位", "Turnout_SetJC": "设置挤岔故障", "Turnout_SetSB": "设置失表故障", "Turnout_Undefined": "未定义" @@ -6225,7 +6150,10 @@ const docTemplate = `{ "Turnout_SetSB", "Turnout_CancelSB", "Turnout_SetJC", - "Turnout_CancelJC" + "Turnout_CancelJC", + "Turnout_ForceDw", + "Turnout_ForceFw", + "Turnout_CancelForce" ] }, "state.Signal_Aspect": { diff --git a/docs/swagger.json b/docs/swagger.json index af3a930..b46be8b 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -3124,58 +3124,6 @@ } } }, - "/api/v1/simulation/axle/operation": { - "post": { - "security": [ - { - "JwtAuth": [] - } - ], - "description": "ATS测试-计轴操作", - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "tags": [ - "ATS测试仿真Api" - ], - "summary": "ATS测试-计轴操作", - "parameters": [ - { - "type": "string", - "description": "JWT Token", - "name": "Authorization", - "in": "header", - "required": true - }, - { - "description": "ATS测试仿真-操作计轴", - "name": "AxleOperationReqDto", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/dto.AxleOperationReqDto" - } - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "type": "string" - } - }, - "500": { - "description": "Internal Server Error", - "schema": { - "$ref": "#/definitions/dto.ErrorDto" - } - } - } - } - }, "/api/v1/simulation/axleSection/operation": { "post": { "security": [ @@ -5284,32 +5232,6 @@ } } }, - "dto.AxleOperationReqDto": { - "type": "object", - "required": [ - "id", - "mapId", - "simulationId" - ], - "properties": { - "id": { - "type": "string" - }, - "mapId": { - "type": "integer" - }, - "operation": { - "$ref": "#/definitions/request_proto.Section_AxleOperation" - }, - "reset": { - "description": "当操作为直接复位或预复位时有效，true-复位，false-取消或结束复位", - "type": "boolean" - }, - "simulationId": { - "type": "string" - } - } - }, "dto.AxleSectionOperationReqDto": { "type": "object", "required": [ @@ -5325,7 +5247,7 @@ "type": "integer" }, "operation": { - "$ref": "#/definitions/request_proto.Section_SectionOperation" + "$ref": "#/definitions/request_proto.Section_Operation" }, "simulationId": { "type": "string" @@ -6086,32 +6008,29 @@ } } }, - "request_proto.Section_AxleOperation": { + "request_proto.Section_Operation": { "type": "integer", "enum": [ 0, - 1 - ], - "x-enum-comments": { - "Section_Drst": "设置计轴直接复位", - "Section_Pdrst": "设置计轴预复位" - }, - "x-enum-varnames": [ - "Section_Drst", - "Section_Pdrst" - ] - }, - "request_proto.Section_SectionOperation": { - "type": "integer", - "enum": [ - 0, - 1 + 1, + 2, + 3, + 4, + 5 ], "x-enum-comments": { + "Section_CancelDrst": "取消计轴直接复位", "Section_CancelFaultOcc": "取消故障占用", - "Section_SetFaultOcc": "设置故障占用" + "Section_CancelPdrst": "取消计轴预复位", + "Section_SetDrst": "设置计轴直接复位", + "Section_SetFaultOcc": "设置故障占用", + "Section_SetPdrst": "设置计轴预复位" }, "x-enum-varnames": [ + "Section_SetDrst", + "Section_CancelDrst", + "Section_SetPdrst", + "Section_CancelPdrst", "Section_SetFaultOcc", "Section_CancelFaultOcc" ] @@ -6197,15 +6116,21 @@ 5, 6, 7, - 8 + 8, + 9, + 10, + 11 ], "x-enum-comments": { "Turnout_CancelDC": "取消定操", "Turnout_CancelFC": "取消反操", + "Turnout_CancelForce": "取消强制", "Turnout_CancelJC": "取消挤岔故障", "Turnout_CancelSB": "取消失表故障", "Turnout_DC": "定操", "Turnout_FC": "反操", + "Turnout_ForceDw": "强制定位", + "Turnout_ForceFw": "强制反位", "Turnout_SetJC": "设置挤岔故障", "Turnout_SetSB": "设置失表故障", "Turnout_Undefined": "未定义" @@ -6219,7 +6144,10 @@ "Turnout_SetSB", "Turnout_CancelSB", "Turnout_SetJC", - "Turnout_CancelJC" + "Turnout_CancelJC", + "Turnout_ForceDw", + "Turnout_ForceFw", + "Turnout_CancelForce" ] }, "state.Signal_Aspect": { diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 47f7767..fe844f0 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -60,24 +60,6 @@ definitions: name: type: string type: object - dto.AxleOperationReqDto: - properties: - id: - type: string - mapId: - type: integer - operation: - $ref: '#/definitions/request_proto.Section_AxleOperation' - reset: - description: 当操作为直接复位或预复位时有效，true-复位，false-取消或结束复位 - type: boolean - simulationId: - type: string - required: - - id - - mapId - - simulationId - type: object dto.AxleSectionOperationReqDto: properties: id: @@ -85,7 +67,7 @@ definitions: mapId: type: integer operation: - $ref: '#/definitions/request_proto.Section_SectionOperation' + $ref: '#/definitions/request_proto.Section_Operation' simulationId: type: string required: @@ -616,26 +598,27 @@ definitions: description: 名称 type: string type: object - request_proto.Section_AxleOperation: - enum: - - 0 - - 1 - type: integer - x-enum-comments: - Section_Drst: 设置计轴直接复位 - Section_Pdrst: 设置计轴预复位 - x-enum-varnames: - - Section_Drst - - Section_Pdrst - request_proto.Section_SectionOperation: + request_proto.Section_Operation: enum: - 0 - 1 + - 2 + - 3 + - 4 + - 5 type: integer x-enum-comments: + Section_CancelDrst: 取消计轴直接复位 Section_CancelFaultOcc: 取消故障占用 + Section_CancelPdrst: 取消计轴预复位 + Section_SetDrst: 设置计轴直接复位 Section_SetFaultOcc: 设置故障占用 + Section_SetPdrst: 设置计轴预复位 x-enum-varnames: + - Section_SetDrst + - Section_CancelDrst + - Section_SetPdrst + - Section_CancelPdrst - Section_SetFaultOcc - Section_CancelFaultOcc request_proto.Signal_Operation: @@ -690,14 +673,20 @@ definitions: - 6 - 7 - 8 + - 9 + - 10 + - 11 type: integer x-enum-comments: Turnout_CancelDC: 取消定操 Turnout_CancelFC: 取消反操 + Turnout_CancelForce: 取消强制 Turnout_CancelJC: 取消挤岔故障 Turnout_CancelSB: 取消失表故障 Turnout_DC: 定操 Turnout_FC: 反操 + Turnout_ForceDw: 强制定位 + Turnout_ForceFw: 强制反位 Turnout_SetJC: 设置挤岔故障 Turnout_SetSB: 设置失表故障 Turnout_Undefined: 未定义 @@ -711,6 +700,9 @@ definitions: - Turnout_CancelSB - Turnout_SetJC - Turnout_CancelJC + - Turnout_ForceDw + - Turnout_ForceFw + - Turnout_CancelForce request_proto.TurnoutOperationReq: properties: deviceId: @@ -2736,39 +2728,6 @@ paths: summary: 获取仿真地图的公里标范围 tags: - ATS测试仿真Api - /api/v1/simulation/axle/operation: - post: - consumes: - - application/json - description: ATS测试-计轴操作 - parameters: - - description: JWT Token - in: header - name: Authorization - required: true - type: string - - description: ATS测试仿真-操作计轴 - in: body - name: AxleOperationReqDto - required: true - schema: - $ref: '#/definitions/dto.AxleOperationReqDto' - produces: - - application/json - responses: - "200": - description: OK - schema: - type: string - "500": - description: Internal Server Error - schema: - $ref: '#/definitions/dto.ErrorDto' - security: - - JwtAuth: [] - summary: ATS测试-计轴操作 - tags: - - ATS测试仿真Api /api/v1/simulation/axleSection/operation: post: consumes: