From 28f3a2adc5e2bb19fac87bc001cadb3c7ed22640 Mon Sep 17 00:00:00 2001 From: tiger_zhou Date: Thu, 18 Jan 2024 17:33:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E5=8A=9B=E5=AD=A6=E5=88=97=E8=BD=A6?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bj-rtss-message | 2 +- docs/docs.go | 338 ++++++++++++++++++++++++---------------------- docs/swagger.json | 338 ++++++++++++++++++++++++---------------------- docs/swagger.yaml | 291 +++++++++++++++++++-------------------- dto/simulation.go | 10 +- 5 files changed, 514 insertions(+), 465 deletions(-) diff --git a/bj-rtss-message b/bj-rtss-message index f9f2cab..d2d4e85 160000 --- a/bj-rtss-message +++ b/bj-rtss-message @@ -1 +1 @@ -Subproject commit f9f2cabf35774b9be45afd6474a4d40f32a7da36 +Subproject commit d2d4e85e34a89d1b38ee8ed1aacc7a955a89b829 diff --git a/docs/docs.go b/docs/docs.go index c949f1d..29e1619 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -4061,7 +4061,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/dto.SignalOperationReqDto" + "$ref": "#/definitions/request_proto.SignalOperationReq" } } ], @@ -4113,7 +4113,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/request_proto.TurnoutOperationReq" + "$ref": "#/definitions/request_proto.PointsOperationReq" } } ], @@ -4616,16 +4616,6 @@ const docTemplate = `{ "name": "id", "in": "query" }, - { - "type": "integer", - "name": "max_diameter", - "in": "query" - }, - { - "type": "integer", - "name": "min_diameter", - "in": "query" - }, { "type": "string", "name": "name", @@ -4643,6 +4633,7 @@ const docTemplate = `{ }, { "type": "string", + "description": "MinDiameter int32 ` + "`" + `json:\"min_diameter\" form:\"min_diameter\"` + "`" + `\nMaxDiameter int32 ` + "`" + `json:\"max_diameter\" form:\"max_diameter\"` + "`" + `", "name": "train_sets", "in": "query" } @@ -5202,18 +5193,6 @@ const docTemplate = `{ "dto.ConfigTrainData": { "type": "object", "properties": { - "baseResistanceParamA": { - "description": "Mass int32 ` + "`" + `json:\"mass\" form:\"mass\"` + "`" + ` // 列车的质量（100=1ton）", - "type": "number" - }, - "baseResistanceParamB": { - "description": "基本阻力参数B", - "type": "number" - }, - "baseResistanceParamC": { - "description": "基本阻力参数C", - "type": "number" - }, "curveResistanceParamR1": { "description": "曲线阻力参数R1", "type": "number" @@ -5230,6 +5209,22 @@ const docTemplate = `{ "description": "曲线阻力参数R4", "type": "number" }, + "davisParamA": { + "description": "Mass int32 ` + "`" + `json:\"mass\" form:\"mass\"` + "`" + ` // 列车的质量（100=1ton）", + "type": "number" + }, + "davisParamB": { + "description": "基本阻力参数B", + "type": "number" + }, + "davisParamC": { + "description": "基本阻力参数C", + "type": "number" + }, + "idling": { + "description": "空转", + "type": "number" + }, "jump": { "description": "是否跳跃", "type": "boolean" @@ -5255,7 +5250,7 @@ const docTemplate = `{ "dto.ConfigTrainEnds": { "type": "object", "properties": { - "radarCheckSpeed": { + "radarCheckSpeedDiff": { "description": "雷达测速数值", "type": "number" }, @@ -5675,43 +5670,6 @@ const docTemplate = `{ } } }, - "dto.SignalOperationReqDto": { - "type": "object", - "required": [ - "aspect", - "id", - "mapId", - "operation", - "simulationId" - ], - "properties": { - "aspect": { - "description": "当操作为Operation.Display时有效，表示显示的信号", - "allOf": [ - { - "$ref": "#/definitions/state_proto.Signal_Aspect" - } - ] - }, - "id": { - "type": "integer" - }, - "mapId": { - "type": "integer" - }, - "operation": { - "description": "信号机操作类型", - "allOf": [ - { - "$ref": "#/definitions/request_proto.Signal_Operation" - } - ] - }, - "simulationId": { - "type": "string" - } - } - }, "dto.SimulationCreateReqDto": { "type": "object", "properties": { @@ -5807,12 +5765,6 @@ const docTemplate = `{ "id": { "type": "integer" }, - "max_diameter": { - "type": "integer" - }, - "min_diameter": { - "type": "integer" - }, "name": { "type": "string" }, @@ -5826,6 +5778,7 @@ const docTemplate = `{ "type": "integer" }, "train_sets": { + "description": "MinDiameter int32 ` + "`" + `json:\"min_diameter\" form:\"min_diameter\"` + "`" + `\nMaxDiameter int32 ` + "`" + `json:\"max_diameter\" form:\"max_diameter\"` + "`" + `", "type": "string" } } @@ -6029,6 +5982,88 @@ const docTemplate = `{ } } }, + "request_proto.PointsOperationReq": { + "type": "object", + "properties": { + "deviceId": { + "description": "设备id", + "type": "integer" + }, + "mapId": { + "description": "图id", + "type": "integer" + }, + "operation": { + "description": "道岔操作", + "allOf": [ + { + "$ref": "#/definitions/request_proto.Points_Operation" + } + ] + }, + "param": { + "description": "道岔参数,当operation为SetParams时有效", + "allOf": [ + { + "$ref": "#/definitions/request_proto.PointsParam" + } + ] + }, + "simulationId": { + "description": "仿真id", + "type": "string" + } + } + }, + "request_proto.PointsParam": { + "type": "object", + "properties": { + "forcePosition": { + "description": "道岔强制", + "allOf": [ + { + "$ref": "#/definitions/request_proto.Points_Force" + } + ] + } + } + }, + "request_proto.Points_Force": { + "type": "integer", + "enum": [ + 0, + 1, + 2, + 3 + ], + "x-enum-comments": { + "Points_FP_DW": "定位", + "Points_FP_FW": "反位", + "Points_FP_NONE": "无强制", + "Points_FP_SB": "失表" + }, + "x-enum-varnames": [ + "Points_FP_NONE", + "Points_FP_DW", + "Points_FP_FW", + "Points_FP_SB" + ] + }, + "request_proto.Points_Operation": { + "type": "integer", + "enum": [ + 0, + 1 + ], + "x-enum-comments": { + "Points_SetParams": "设置参数", + "Points_Undefined": "未定义" + }, + "x-enum-varnames": [ + "Points_Undefined", + "Points_SetParams" + ] + }, "request_proto.PsdOperationReq": { "type": "object", "properties": { @@ -6148,52 +6183,7 @@ const docTemplate = `{ "Section_CancelFaultOcc" ] }, - "request_proto.Signal_Operation": { - "type": "integer", - "enum": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11 - ], - "x-enum-comments": { - "Signal_Display": "显示操作,如设置绿色、设置红黄色", - "Signal_LightACancelDs": "取消蓝灯断丝故障", - "Signal_LightAFaultDs": "设置蓝灯断丝故障", - "Signal_LightBCancelDs": "取消白灯断丝故障", - "Signal_LightBFaultDs": "设置白灯断丝故障", - "Signal_LightHCancelDs": "取消红灯断丝故障", - "Signal_LightHFaultDs": "设置红灯断丝故障", - "Signal_LightLCancelDs": "取消绿灯断丝故障", - "Signal_LightLFaultDs": "设置绿灯断丝故障", - "Signal_LightUCancelDs": "取消黄灯断丝故障", - "Signal_LightUFaultDs": "设置黄灯断丝故障", - "Signal_Undefined": "未定义" - }, - "x-enum-varnames": [ - "Signal_Undefined", - "Signal_Display", - "Signal_LightHFaultDs", - "Signal_LightUFaultDs", - "Signal_LightLFaultDs", - "Signal_LightAFaultDs", - "Signal_LightBFaultDs", - "Signal_LightHCancelDs", - "Signal_LightUCancelDs", - "Signal_LightLCancelDs", - "Signal_LightACancelDs", - "Signal_LightBCancelDs" - ] - }, - "request_proto.TurnoutOperationReq": { + "request_proto.SignalOperationReq": { "type": "object", "properties": { "deviceId": { @@ -6205,10 +6195,18 @@ const docTemplate = `{ "type": "integer" }, "operation": { - "description": "道岔操作", + "description": "信号机操作", "allOf": [ { - "$ref": "#/definitions/request_proto.Turnout_Operation" + "$ref": "#/definitions/request_proto.Signal_Operation" + } + ] + }, + "param": { + "description": "信号机参数,当operation为SetParams时有效", + "allOf": [ + { + "$ref": "#/definitions/request_proto.SignalParam" } ] }, @@ -6218,52 +6216,51 @@ const docTemplate = `{ } } }, - "request_proto.Turnout_Operation": { + "request_proto.SignalParam": { + "type": "object", + "properties": { + "dsList": { + "description": "信号机断丝", + "type": "array", + "items": { + "$ref": "#/definitions/request_proto.Signal_DS" + } + }, + "force": { + "description": "信号机强制", + "allOf": [ + { + "$ref": "#/definitions/request_proto.Signal_Force" + } + ] + } + } + }, + "request_proto.Signal_DS": { "type": "integer", "enum": [ 0, 1, 2, 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11 + 4 ], "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": "未定义" + "Signal_DS_A": "蓝灯断丝", + "Signal_DS_B": "白灯断丝", + "Signal_DS_H": "红灯断丝", + "Signal_DS_L": "绿灯断丝", + "Signal_DS_U": "黄灯断丝" }, "x-enum-varnames": [ - "Turnout_Undefined", - "Turnout_DC", - "Turnout_CancelDC", - "Turnout_FC", - "Turnout_CancelFC", - "Turnout_SetSB", - "Turnout_CancelSB", - "Turnout_SetJC", - "Turnout_CancelJC", - "Turnout_ForceDw", - "Turnout_ForceFw", - "Turnout_CancelForce" + "Signal_DS_H", + "Signal_DS_U", + "Signal_DS_L", + "Signal_DS_A", + "Signal_DS_B" ] }, - "state_proto.Signal_Aspect": { + "request_proto.Signal_Force": { "type": "integer", "enum": [ 0, @@ -6275,15 +6272,40 @@ const docTemplate = `{ 6, 7 ], + "x-enum-comments": { + "Signal_SF_A": "蓝灯", + "Signal_SF_B": "白灯", + "Signal_SF_H": "红灯", + "Signal_SF_HU": "红黄灯", + "Signal_SF_L": "绿灯", + "Signal_SF_M": "灭灯", + "Signal_SF_NONE": "无强制", + "Signal_SF_U": "黄灯" + }, "x-enum-varnames": [ - "Signal_Non", - "Signal_OFF", - "Signal_L", - "Signal_H", - "Signal_U", - "Signal_HU", - "Signal_B", - "Signal_A" + "Signal_SF_NONE", + "Signal_SF_M", + "Signal_SF_H", + "Signal_SF_U", + "Signal_SF_L", + "Signal_SF_HU", + "Signal_SF_A", + "Signal_SF_B" + ] + }, + "request_proto.Signal_Operation": { + "type": "integer", + "enum": [ + 0, + 1 + ], + "x-enum-comments": { + "Signal_SetParams": "设置参数", + "Signal_Undefined": "未定义" + }, + "x-enum-varnames": [ + "Signal_Undefined", + "Signal_SetParams" ] } }, diff --git a/docs/swagger.json b/docs/swagger.json index ceb0c01..ec6d931 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -4055,7 +4055,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/dto.SignalOperationReqDto" + "$ref": "#/definitions/request_proto.SignalOperationReq" } } ], @@ -4107,7 +4107,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/request_proto.TurnoutOperationReq" + "$ref": "#/definitions/request_proto.PointsOperationReq" } } ], @@ -4610,16 +4610,6 @@ "name": "id", "in": "query" }, - { - "type": "integer", - "name": "max_diameter", - "in": "query" - }, - { - "type": "integer", - "name": "min_diameter", - "in": "query" - }, { "type": "string", "name": "name", @@ -4637,6 +4627,7 @@ }, { "type": "string", + "description": "MinDiameter int32 `json:\"min_diameter\" form:\"min_diameter\"`\nMaxDiameter int32 `json:\"max_diameter\" form:\"max_diameter\"`", "name": "train_sets", "in": "query" } @@ -5196,18 +5187,6 @@ "dto.ConfigTrainData": { "type": "object", "properties": { - "baseResistanceParamA": { - "description": "Mass int32 `json:\"mass\" form:\"mass\"` // 列车的质量（100=1ton）", - "type": "number" - }, - "baseResistanceParamB": { - "description": "基本阻力参数B", - "type": "number" - }, - "baseResistanceParamC": { - "description": "基本阻力参数C", - "type": "number" - }, "curveResistanceParamR1": { "description": "曲线阻力参数R1", "type": "number" @@ -5224,6 +5203,22 @@ "description": "曲线阻力参数R4", "type": "number" }, + "davisParamA": { + "description": "Mass int32 `json:\"mass\" form:\"mass\"` // 列车的质量（100=1ton）", + "type": "number" + }, + "davisParamB": { + "description": "基本阻力参数B", + "type": "number" + }, + "davisParamC": { + "description": "基本阻力参数C", + "type": "number" + }, + "idling": { + "description": "空转", + "type": "number" + }, "jump": { "description": "是否跳跃", "type": "boolean" @@ -5249,7 +5244,7 @@ "dto.ConfigTrainEnds": { "type": "object", "properties": { - "radarCheckSpeed": { + "radarCheckSpeedDiff": { "description": "雷达测速数值", "type": "number" }, @@ -5669,43 +5664,6 @@ } } }, - "dto.SignalOperationReqDto": { - "type": "object", - "required": [ - "aspect", - "id", - "mapId", - "operation", - "simulationId" - ], - "properties": { - "aspect": { - "description": "当操作为Operation.Display时有效，表示显示的信号", - "allOf": [ - { - "$ref": "#/definitions/state_proto.Signal_Aspect" - } - ] - }, - "id": { - "type": "integer" - }, - "mapId": { - "type": "integer" - }, - "operation": { - "description": "信号机操作类型", - "allOf": [ - { - "$ref": "#/definitions/request_proto.Signal_Operation" - } - ] - }, - "simulationId": { - "type": "string" - } - } - }, "dto.SimulationCreateReqDto": { "type": "object", "properties": { @@ -5801,12 +5759,6 @@ "id": { "type": "integer" }, - "max_diameter": { - "type": "integer" - }, - "min_diameter": { - "type": "integer" - }, "name": { "type": "string" }, @@ -5820,6 +5772,7 @@ "type": "integer" }, "train_sets": { + "description": "MinDiameter int32 `json:\"min_diameter\" form:\"min_diameter\"`\nMaxDiameter int32 `json:\"max_diameter\" form:\"max_diameter\"`", "type": "string" } } @@ -6023,6 +5976,88 @@ } } }, + "request_proto.PointsOperationReq": { + "type": "object", + "properties": { + "deviceId": { + "description": "设备id", + "type": "integer" + }, + "mapId": { + "description": "图id", + "type": "integer" + }, + "operation": { + "description": "道岔操作", + "allOf": [ + { + "$ref": "#/definitions/request_proto.Points_Operation" + } + ] + }, + "param": { + "description": "道岔参数,当operation为SetParams时有效", + "allOf": [ + { + "$ref": "#/definitions/request_proto.PointsParam" + } + ] + }, + "simulationId": { + "description": "仿真id", + "type": "string" + } + } + }, + "request_proto.PointsParam": { + "type": "object", + "properties": { + "forcePosition": { + "description": "道岔强制", + "allOf": [ + { + "$ref": "#/definitions/request_proto.Points_Force" + } + ] + } + } + }, + "request_proto.Points_Force": { + "type": "integer", + "enum": [ + 0, + 1, + 2, + 3 + ], + "x-enum-comments": { + "Points_FP_DW": "定位", + "Points_FP_FW": "反位", + "Points_FP_NONE": "无强制", + "Points_FP_SB": "失表" + }, + "x-enum-varnames": [ + "Points_FP_NONE", + "Points_FP_DW", + "Points_FP_FW", + "Points_FP_SB" + ] + }, + "request_proto.Points_Operation": { + "type": "integer", + "enum": [ + 0, + 1 + ], + "x-enum-comments": { + "Points_SetParams": "设置参数", + "Points_Undefined": "未定义" + }, + "x-enum-varnames": [ + "Points_Undefined", + "Points_SetParams" + ] + }, "request_proto.PsdOperationReq": { "type": "object", "properties": { @@ -6142,52 +6177,7 @@ "Section_CancelFaultOcc" ] }, - "request_proto.Signal_Operation": { - "type": "integer", - "enum": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11 - ], - "x-enum-comments": { - "Signal_Display": "显示操作,如设置绿色、设置红黄色", - "Signal_LightACancelDs": "取消蓝灯断丝故障", - "Signal_LightAFaultDs": "设置蓝灯断丝故障", - "Signal_LightBCancelDs": "取消白灯断丝故障", - "Signal_LightBFaultDs": "设置白灯断丝故障", - "Signal_LightHCancelDs": "取消红灯断丝故障", - "Signal_LightHFaultDs": "设置红灯断丝故障", - "Signal_LightLCancelDs": "取消绿灯断丝故障", - "Signal_LightLFaultDs": "设置绿灯断丝故障", - "Signal_LightUCancelDs": "取消黄灯断丝故障", - "Signal_LightUFaultDs": "设置黄灯断丝故障", - "Signal_Undefined": "未定义" - }, - "x-enum-varnames": [ - "Signal_Undefined", - "Signal_Display", - "Signal_LightHFaultDs", - "Signal_LightUFaultDs", - "Signal_LightLFaultDs", - "Signal_LightAFaultDs", - "Signal_LightBFaultDs", - "Signal_LightHCancelDs", - "Signal_LightUCancelDs", - "Signal_LightLCancelDs", - "Signal_LightACancelDs", - "Signal_LightBCancelDs" - ] - }, - "request_proto.TurnoutOperationReq": { + "request_proto.SignalOperationReq": { "type": "object", "properties": { "deviceId": { @@ -6199,10 +6189,18 @@ "type": "integer" }, "operation": { - "description": "道岔操作", + "description": "信号机操作", "allOf": [ { - "$ref": "#/definitions/request_proto.Turnout_Operation" + "$ref": "#/definitions/request_proto.Signal_Operation" + } + ] + }, + "param": { + "description": "信号机参数,当operation为SetParams时有效", + "allOf": [ + { + "$ref": "#/definitions/request_proto.SignalParam" } ] }, @@ -6212,52 +6210,51 @@ } } }, - "request_proto.Turnout_Operation": { + "request_proto.SignalParam": { + "type": "object", + "properties": { + "dsList": { + "description": "信号机断丝", + "type": "array", + "items": { + "$ref": "#/definitions/request_proto.Signal_DS" + } + }, + "force": { + "description": "信号机强制", + "allOf": [ + { + "$ref": "#/definitions/request_proto.Signal_Force" + } + ] + } + } + }, + "request_proto.Signal_DS": { "type": "integer", "enum": [ 0, 1, 2, 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11 + 4 ], "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": "未定义" + "Signal_DS_A": "蓝灯断丝", + "Signal_DS_B": "白灯断丝", + "Signal_DS_H": "红灯断丝", + "Signal_DS_L": "绿灯断丝", + "Signal_DS_U": "黄灯断丝" }, "x-enum-varnames": [ - "Turnout_Undefined", - "Turnout_DC", - "Turnout_CancelDC", - "Turnout_FC", - "Turnout_CancelFC", - "Turnout_SetSB", - "Turnout_CancelSB", - "Turnout_SetJC", - "Turnout_CancelJC", - "Turnout_ForceDw", - "Turnout_ForceFw", - "Turnout_CancelForce" + "Signal_DS_H", + "Signal_DS_U", + "Signal_DS_L", + "Signal_DS_A", + "Signal_DS_B" ] }, - "state_proto.Signal_Aspect": { + "request_proto.Signal_Force": { "type": "integer", "enum": [ 0, @@ -6269,15 +6266,40 @@ 6, 7 ], + "x-enum-comments": { + "Signal_SF_A": "蓝灯", + "Signal_SF_B": "白灯", + "Signal_SF_H": "红灯", + "Signal_SF_HU": "红黄灯", + "Signal_SF_L": "绿灯", + "Signal_SF_M": "灭灯", + "Signal_SF_NONE": "无强制", + "Signal_SF_U": "黄灯" + }, "x-enum-varnames": [ - "Signal_Non", - "Signal_OFF", - "Signal_L", - "Signal_H", - "Signal_U", - "Signal_HU", - "Signal_B", - "Signal_A" + "Signal_SF_NONE", + "Signal_SF_M", + "Signal_SF_H", + "Signal_SF_U", + "Signal_SF_L", + "Signal_SF_HU", + "Signal_SF_A", + "Signal_SF_B" + ] + }, + "request_proto.Signal_Operation": { + "type": "integer", + "enum": [ + 0, + 1 + ], + "x-enum-comments": { + "Signal_SetParams": "设置参数", + "Signal_Undefined": "未定义" + }, + "x-enum-varnames": [ + "Signal_Undefined", + "Signal_SetParams" ] } }, diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 99309de..9579750 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -191,16 +191,6 @@ definitions: type: object dto.ConfigTrainData: properties: - baseResistanceParamA: - description: Mass int32 `json:"mass" form:"mass"` // - 列车的质量（100=1ton） - type: number - baseResistanceParamB: - description: 基本阻力参数B - type: number - baseResistanceParamC: - description: 基本阻力参数C - type: number curveResistanceParamR1: description: 曲线阻力参数R1 type: number @@ -213,6 +203,19 @@ definitions: curveResistanceParamR4: description: 曲线阻力参数R4 type: number + davisParamA: + description: Mass int32 `json:"mass" form:"mass"` // + 列车的质量（100=1ton） + type: number + davisParamB: + description: 基本阻力参数B + type: number + davisParamC: + description: 基本阻力参数C + type: number + idling: + description: 空转 + type: number jump: description: 是否跳跃 type: boolean @@ -231,7 +234,7 @@ definitions: type: object dto.ConfigTrainEnds: properties: - radarCheckSpeed: + radarCheckSpeedDiff: description: 雷达测速数值 type: number radarCheckTime: @@ -515,29 +518,6 @@ definitions: description: 新添加的列车的索引 type: string type: object - dto.SignalOperationReqDto: - properties: - aspect: - allOf: - - $ref: '#/definitions/state_proto.Signal_Aspect' - description: 当操作为Operation.Display时有效，表示显示的信号 - id: - type: integer - mapId: - type: integer - operation: - allOf: - - $ref: '#/definitions/request_proto.Signal_Operation' - description: 信号机操作类型 - simulationId: - type: string - required: - - aspect - - id - - mapId - - operation - - simulationId - type: object dto.SimulationCreateReqDto: properties: mapId: @@ -603,10 +583,6 @@ definitions: type: string id: type: integer - max_diameter: - type: integer - min_diameter: - type: integer name: type: string total_length: @@ -614,6 +590,9 @@ definitions: train_model: type: integer train_sets: + description: |- + MinDiameter int32 `json:"min_diameter" form:"min_diameter"` + MaxDiameter int32 `json:"max_diameter" form:"max_diameter"` type: string trainConfigData: $ref: '#/definitions/dto.ConfigTrainData' @@ -761,6 +740,61 @@ definitions: description: 数据类型 type: integer type: object + request_proto.Points_Force: + enum: + - 0 + - 1 + - 2 + - 3 + type: integer + x-enum-comments: + Points_FP_DW: 定位 + Points_FP_FW: 反位 + Points_FP_NONE: 无强制 + Points_FP_SB: 失表 + x-enum-varnames: + - Points_FP_NONE + - Points_FP_DW + - Points_FP_FW + - Points_FP_SB + request_proto.Points_Operation: + enum: + - 0 + - 1 + type: integer + x-enum-comments: + Points_SetParams: 设置参数 + Points_Undefined: 未定义 + x-enum-varnames: + - Points_Undefined + - Points_SetParams + request_proto.PointsOperationReq: + properties: + deviceId: + description: 设备id + type: integer + mapId: + description: 图id + type: integer + operation: + allOf: + - $ref: '#/definitions/request_proto.Points_Operation' + description: 道岔操作 + param: + allOf: + - $ref: '#/definitions/request_proto.PointsParam' + description: 道岔参数,当operation为SetParams时有效 + simulationId: + description: 仿真id + type: string + type: object + request_proto.PointsParam: + properties: + forcePosition: + allOf: + - $ref: '#/definitions/request_proto.Points_Force' + description: 道岔强制 + type: object request_proto.Psd_Operation: enum: - 0 @@ -860,89 +894,67 @@ definitions: - Section_CancelPdrst - Section_SetFaultOcc - Section_CancelFaultOcc + request_proto.Signal_DS: + enum: + - 0 + - 1 + - 2 + - 3 + - 4 + type: integer + x-enum-comments: + Signal_DS_A: 蓝灯断丝 + Signal_DS_B: 白灯断丝 + Signal_DS_H: 红灯断丝 + Signal_DS_L: 绿灯断丝 + Signal_DS_U: 黄灯断丝 + x-enum-varnames: + - Signal_DS_H + - Signal_DS_U + - Signal_DS_L + - Signal_DS_A + - Signal_DS_B + request_proto.Signal_Force: + enum: + - 0 + - 1 + - 2 + - 3 + - 4 + - 5 + - 6 + - 7 + type: integer + x-enum-comments: + Signal_SF_A: 蓝灯 + Signal_SF_B: 白灯 + Signal_SF_H: 红灯 + Signal_SF_HU: 红黄灯 + Signal_SF_L: 绿灯 + Signal_SF_M: 灭灯 + Signal_SF_NONE: 无强制 + Signal_SF_U: 黄灯 + x-enum-varnames: + - Signal_SF_NONE + - Signal_SF_M + - Signal_SF_H + - Signal_SF_U + - Signal_SF_L + - Signal_SF_HU + - Signal_SF_A + - Signal_SF_B request_proto.Signal_Operation: enum: - 0 - 1 - - 2 - - 3 - - 4 - - 5 - - 6 - - 7 - - 8 - - 9 - - 10 - - 11 type: integer x-enum-comments: - Signal_Display: 显示操作,如设置绿色、设置红黄色 - Signal_LightACancelDs: 取消蓝灯断丝故障 - Signal_LightAFaultDs: 设置蓝灯断丝故障 - Signal_LightBCancelDs: 取消白灯断丝故障 - Signal_LightBFaultDs: 设置白灯断丝故障 - Signal_LightHCancelDs: 取消红灯断丝故障 - Signal_LightHFaultDs: 设置红灯断丝故障 - Signal_LightLCancelDs: 取消绿灯断丝故障 - Signal_LightLFaultDs: 设置绿灯断丝故障 - Signal_LightUCancelDs: 取消黄灯断丝故障 - Signal_LightUFaultDs: 设置黄灯断丝故障 + Signal_SetParams: 设置参数 Signal_Undefined: 未定义 x-enum-varnames: - Signal_Undefined - - Signal_Display - - Signal_LightHFaultDs - - Signal_LightUFaultDs - - Signal_LightLFaultDs - - Signal_LightAFaultDs - - Signal_LightBFaultDs - - Signal_LightHCancelDs - - Signal_LightUCancelDs - - Signal_LightLCancelDs - - Signal_LightACancelDs - - Signal_LightBCancelDs - request_proto.Turnout_Operation: - enum: - - 0 - - 1 - - 2 - - 3 - - 4 - - 5 - - 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: 未定义 - x-enum-varnames: - - Turnout_Undefined - - Turnout_DC - - Turnout_CancelDC - - Turnout_FC - - Turnout_CancelFC - - Turnout_SetSB - - Turnout_CancelSB - - Turnout_SetJC - - Turnout_CancelJC - - Turnout_ForceDw - - Turnout_ForceFw - - Turnout_CancelForce - request_proto.TurnoutOperationReq: + - Signal_SetParams + request_proto.SignalOperationReq: properties: deviceId: description: 设备id @@ -952,32 +964,28 @@ definitions: type: integer operation: allOf: - - $ref: '#/definitions/request_proto.Turnout_Operation' - description: 道岔操作 + - $ref: '#/definitions/request_proto.Signal_Operation' + description: 信号机操作 + param: + allOf: + - $ref: '#/definitions/request_proto.SignalParam' + description: 信号机参数,当operation为SetParams时有效 simulationId: description: 仿真id type: string type: object - state_proto.Signal_Aspect: - enum: - - 0 - - 1 - - 2 - - 3 - - 4 - - 5 - - 6 - - 7 - type: integer - x-enum-varnames: - - Signal_Non - - Signal_OFF - - Signal_L - - Signal_H - - Signal_U - - Signal_HU - - Signal_B - - Signal_A + request_proto.SignalParam: + properties: + dsList: + description: 信号机断丝 + items: + $ref: '#/definitions/request_proto.Signal_DS' + type: array + force: + allOf: + - $ref: '#/definitions/request_proto.Signal_Force' + description: 信号机强制 + type: object host: localhost:9091 info: contact: {} @@ -3553,7 +3561,7 @@ paths: name: SignalOperationReqDto required: true schema: - $ref: '#/definitions/dto.SignalOperationReqDto' + $ref: '#/definitions/request_proto.SignalOperationReq' produces: - application/json responses: @@ -3586,7 +3594,7 @@ paths: name: TurnoutOperationReq required: true schema: - $ref: '#/definitions/request_proto.TurnoutOperationReq' + $ref: '#/definitions/request_proto.PointsOperationReq' produces: - application/json responses: @@ -3855,12 +3863,6 @@ paths: - in: query name: id type: integer - - in: query - name: max_diameter - type: integer - - in: query - name: min_diameter - type: integer - in: query name: name type: string @@ -3870,7 +3872,10 @@ paths: - in: query name: train_model type: integer - - in: query + - description: |- + MinDiameter int32 `json:"min_diameter" form:"min_diameter"` + MaxDiameter int32 `json:"max_diameter" form:"max_diameter"` + in: query name: train_sets type: string produces: diff --git a/dto/simulation.go b/dto/simulation.go index fb9360d..d1911e0 100644 --- a/dto/simulation.go +++ b/dto/simulation.go @@ -92,11 +92,11 @@ type ConfigTrainReqDto struct { WheelDiameter int32 `json:"wheelDiameter"` // 轮径（mm） } type ConfigTrainEnds struct { - SpeedSensorEnableA bool `json:"speedSensorEnableA"` // 2端速度传感器是否有效 - SpeedSensorEnableB bool `json:"speedSensorEnableB"` // 2端速度传感器是否有效 - RadarEnable bool `json:"radarEnable"` // 雷达是否有效 - RadarCheckSpeedDiff float32 `json:"radarCheckSpeed"` // 雷达测速数值 - RadarCheckTime int32 `json:"radarCheckTime"` // 雷达检测时间(秒) + SpeedSensorEnableA bool `json:"speedSensorEnableA"` // 2端速度传感器是否有效 + SpeedSensorEnableB bool `json:"speedSensorEnableB"` // 2端速度传感器是否有效 + RadarEnable bool `json:"radarEnable"` // 雷达是否有效 + RadarCheckSpeedDiff float32 `json:"radarCheckSpeedDiff"` // 雷达测速数值 + RadarCheckTime int32 `json:"radarCheckTime"` // 雷达检测时间(秒) } type ConfigTrainData struct { //Mass int32 `json:"mass" form:"mass"` // 列车的质量（100=1ton）