Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message
This commit is contained in:
commit
649dd84620
@ -52,11 +52,11 @@ message TrainState{
|
||||
string id = 1;
|
||||
//车头所在link的索引
|
||||
string headLinkId = 2;
|
||||
//车头所在link内的偏移量,单位为cm
|
||||
//车头所在link内的偏移量,单位为mm
|
||||
int64 headLinkOffset = 3;
|
||||
//车尾所在link的索引
|
||||
string tailLinkId = 4;
|
||||
//车尾所在link内的偏移量,单位为cm
|
||||
//车尾所在link内的偏移量,单位为mm
|
||||
int64 tailLinkOffset = 5;
|
||||
//列车所占用的link的索引的列表
|
||||
//顺序为从车头到车尾
|
||||
@ -86,3 +86,14 @@ message AllDevicesStatus{
|
||||
//所有类型区段状态
|
||||
repeated SectionState sectionState = 3;
|
||||
}
|
||||
|
||||
//服务器端向前端推送的设备状态信息
|
||||
message PushedDevicesStatus{
|
||||
//true-全量设备状态信息,此时allStatus有效;
|
||||
//false - 增量设备状态消息,此时varStatus有效
|
||||
bool all = 1;
|
||||
//增量设备状态消息
|
||||
VariationStatus varStatus = 2;
|
||||
//全量设备状态信息
|
||||
AllDevicesStatus allStatus = 3;
|
||||
}
|
||||
|
@ -6,16 +6,16 @@ option java_outer_classname = "LayoutGraphicsProto";
|
||||
|
||||
message RtssGraphicStorage {
|
||||
Canvas canvas = 1;
|
||||
repeated Link links = 2;
|
||||
repeated IscsFan iscsFans = 3;
|
||||
// repeated Link links = 2;
|
||||
// repeated IscsFan iscsFans = 3;
|
||||
repeated Platform Platforms = 4;
|
||||
repeated Station stations = 5;
|
||||
repeated Rect rects = 6;
|
||||
repeated Train train = 7;
|
||||
// repeated Rect rects = 6;
|
||||
// repeated Train train = 7;
|
||||
repeated Signal signals = 8;
|
||||
repeated Turnout turnouts = 9;
|
||||
repeated Section section = 10;
|
||||
repeated Polygon polygons = 11;
|
||||
// repeated Polygon polygons = 11;
|
||||
repeated TrainWindow trainWindows = 12;
|
||||
repeated AxleCounting axleCountings = 13;
|
||||
repeated Separator separators = 14;
|
||||
@ -69,34 +69,34 @@ message CommonInfo {
|
||||
repeated ChildTransform childTransforms = 4;
|
||||
}
|
||||
|
||||
message Link {
|
||||
CommonInfo common = 1;
|
||||
string code = 2;
|
||||
bool curve = 3; // 是否曲线
|
||||
int32 segmentsCount = 4; // 曲线分段数
|
||||
int32 lineWidth = 5; // 线宽
|
||||
string lineColor = 6; // 线色
|
||||
repeated Point points = 7; // 点坐标列表
|
||||
}
|
||||
// message Link {
|
||||
// CommonInfo common = 1;
|
||||
// string code = 2;
|
||||
// bool curve = 3; // 是否曲线
|
||||
// int32 segmentsCount = 4; // 曲线分段数
|
||||
// int32 lineWidth = 5; // 线宽
|
||||
// string lineColor = 6; // 线色
|
||||
// repeated Point points = 7; // 点坐标列表
|
||||
// }
|
||||
|
||||
message Rect {
|
||||
CommonInfo common = 1;
|
||||
string code = 2;
|
||||
int32 lineWidth = 3; // 线宽
|
||||
string lineColor = 4; // 线色
|
||||
float width = 5; //宽度
|
||||
float height = 6; //高度
|
||||
int32 radius = 7; //圆角半径
|
||||
Point point = 8; // 画第一个点的坐标
|
||||
}
|
||||
// message Rect {
|
||||
// CommonInfo common = 1;
|
||||
// string code = 2;
|
||||
// int32 lineWidth = 3; // 线宽
|
||||
// string lineColor = 4; // 线色
|
||||
// float width = 5; //宽度
|
||||
// float height = 6; //高度
|
||||
// int32 radius = 7; //圆角半径
|
||||
// Point point = 8; // 画第一个点的坐标
|
||||
// }
|
||||
|
||||
message Polygon {
|
||||
CommonInfo common = 1;
|
||||
string code = 2;
|
||||
int32 lineWidth = 3; // 线宽
|
||||
string lineColor = 4; // 线色
|
||||
repeated Point points = 5; // 点坐标列表
|
||||
}
|
||||
// message Polygon {
|
||||
// CommonInfo common = 1;
|
||||
// string code = 2;
|
||||
// int32 lineWidth = 3; // 线宽
|
||||
// string lineColor = 4; // 线色
|
||||
// repeated Point points = 5; // 点坐标列表
|
||||
// }
|
||||
|
||||
message Platform {
|
||||
CommonInfo common = 1;
|
||||
@ -124,19 +124,19 @@ message AxleCounting {
|
||||
CommonInfo common = 1;
|
||||
string code = 2;
|
||||
KilometerSystem kilometerSystem = 3; //公里标
|
||||
repeated RelatedRef axleCountingRef = 4; // 关联的设备
|
||||
repeated RelatedRef axleCountingRef = 4; // 计轴关联的区段和道岔
|
||||
int32 indexNumber = 5; //计轴的索引编号
|
||||
}
|
||||
|
||||
message Train {
|
||||
CommonInfo common = 1;
|
||||
string code = 2;
|
||||
}
|
||||
// message Train {
|
||||
// CommonInfo common = 1;
|
||||
// string code = 2;
|
||||
// }
|
||||
|
||||
message IscsFan {
|
||||
CommonInfo common = 1;
|
||||
string code = 2;
|
||||
}
|
||||
// message IscsFan {
|
||||
// CommonInfo common = 1;
|
||||
// string code = 2;
|
||||
// }
|
||||
|
||||
message Turnout {
|
||||
CommonInfo common = 1;
|
||||
@ -209,10 +209,10 @@ message RelatedRef {
|
||||
DevicePort devicePort = 3; //关联的设备端口
|
||||
}
|
||||
|
||||
//与道岔的位置关系
|
||||
//计轴区段与道岔的位置关系
|
||||
message TurnoutPosRef {
|
||||
string id = 1; //道岔的ID
|
||||
int32 position = 2; //道岔的正反为,0是正位,1是反位
|
||||
int32 position = 2; //道岔的正反为,0是定位,1是反位
|
||||
}
|
||||
|
||||
message Separator { // 分隔符
|
||||
@ -246,10 +246,10 @@ message AxleCountingSection { // 计轴区段
|
||||
CommonInfo common = 1;
|
||||
string code = 2;
|
||||
repeated Point points = 3;
|
||||
RelatedRef paRef = 4; // 区段A端关联的设备
|
||||
RelatedRef pbRef = 5; // 区段B端关联的设备
|
||||
repeated TurnoutPosRef turnoutPos = 6; //关联道岔的正反位
|
||||
int32 indexNumber = 7; //区段的索引编号
|
||||
RelatedRef paRef = 4; // 计轴区段A端关联的计轴
|
||||
RelatedRef pbRef = 5; // 计轴区段B端关联的计轴
|
||||
repeated TurnoutPosRef turnoutPos = 6; //关联道岔的正反位--0是定位,1是反位
|
||||
int32 indexNumber = 7; //计轴区段的索引编号
|
||||
}
|
||||
|
||||
message LogicSection { // 逻辑区段
|
||||
@ -258,4 +258,5 @@ message LogicSection { // 逻辑区段
|
||||
repeated Point points = 3;
|
||||
string axleSectionId = 4; // 关联的计轴区段Id
|
||||
int32 indexNumber = 5; // 索引编号
|
||||
string turnoutId = 6; // 关联的岔芯对应的道岔id
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user