diff --git a/protos/device_state.proto b/protos/device_state.proto index 4d8eafb..7be8536 100644 --- a/protos/device_state.proto +++ b/protos/device_state.proto @@ -121,19 +121,19 @@ message TrainDynamicState { //阻力3(曲线阻力)(N)curveResistance,1=1KN float curveResistance = 13; //列车运行速度(m/s)speed,1=1km/h - float speed = 14; + int32 speed = 14; //头车速传1速度值(m/s)headSpeed1,1=1km/h - float headSensorSpeed1 = 15; + int32 headSensorSpeed1 = 15; //头车速度2速度值(m/s)headSpeed2,1=1km/h - float headSensorSpeed2 = 16; + int32 headSensorSpeed2 = 16; //尾车速传1速度值(m/s)tailSpeed1,1=1km/h - float tailSensorSpeed1 = 17; + int32 tailSensorSpeed1 = 17; //尾车速度2速度值(m/s)tailSpeed2,1=1km/h - float tailSensorSpeed2 = 18; + int32 tailSensorSpeed2 = 18; //头车雷达速度值(m/s)headRadarSpeed,1=1km/h - float headRadarSpeed = 19; + int32 headRadarSpeed = 19; //尾车雷达速度值(m/s)tailRadarSpeed,1=1km/h - float tailRadarSpeed = 20; + int32 tailRadarSpeed = 20; } // vobc发过来的列车信息 @@ -222,3 +222,21 @@ message PushedDevicesStatus{ //全量设备状态信息 AllDevicesStatus allStatus = 3; } + +// 仿真信息状态 +message SimulationStatus { + string simulationId = 1; + + int32 mapId = 2; + + int32 projectId = 3; +} + +// 变更信息状态 +message MemoryDataStatus { + repeated SimulationStatus allSimulations = 1; + + repeated SimulationStatus addSimulations = 2; + + repeated SimulationStatus removeSimulations = 3; +} \ No newline at end of file diff --git a/protos/relayCabinetLayoutGraphics.proto b/protos/relayCabinetLayoutGraphics.proto index d6db94b..f89e513 100644 --- a/protos/relayCabinetLayoutGraphics.proto +++ b/protos/relayCabinetLayoutGraphics.proto @@ -1,67 +1,21 @@ syntax = "proto3"; +import "stationLayoutGraphics.proto"; -package graphicData; -option java_package = "club.joylink.bjrtss.ats.verify.protos"; -option java_outer_classname = "LayoutGraphicsProto"; +package relayCabinetGraphicData; option go_package = "./ats/verify/protos/graphicData"; message RelayCabinetGraphicStorage { - Canvas canvas = 1; + graphicData.Canvas canvas = 1; repeated RelayCabinet relayCabinets = 2; repeated Relay relays = 3; } -message Canvas { - // 画布宽 - int32 width = 1; - // 画布高 - int32 height = 2; - // 背景色 - string backgroundColor = 3; - // 视口变换 - Transform viewportTransform = 4; -} - -message Point { - // x坐标 - float x = 1; - // y坐标 - float y = 2; -} - -//变换 -message Transform { - // 位移 - Point position = 1; - // 缩放 - Point scale = 2; - // 旋转弧度 - float rotation = 3; - // 歪斜 - Point skew = 4; -} - -//子元素变换 -message ChildTransform { - // 子元素名称 - string name = 1; - // 子元素变换 - Transform transform = 2; -} -// 公共属性 -message CommonInfo { - string id = 1; - string graphicType = 2; - Transform transform = 3; - repeated ChildTransform childTransforms = 4; -} - message RelayCabinet { - CommonInfo common = 1; + graphicData.CommonInfo common = 1; string code = 2; } message Relay { - CommonInfo common = 1; + graphicData.CommonInfo common = 1; string code = 2; } diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index 280d1f6..c3bf2d0 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -137,6 +137,10 @@ message TrainWindow { } message AxleCounting { + enum TypeDetectionPoint { + AxleCounting = 0; + SectionBoundary=1; +} CommonInfo common = 1; string code = 2; // 名称 KilometerSystem kilometerSystem = 3; //公里标 @@ -144,6 +148,7 @@ message AxleCounting { 4; // 计轴关联的非岔区物理区段和道岔,设备id和端口 int32 index = 5; //计轴的索引编号 bool invent = 6; //是否虚拟计轴--一般是最末端 + TypeDetectionPoint type = 7; //检测点的类型:计轴、区段边界 } // message Train {