joylink/xian-ncc-da-message
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-message

Browse Source
This commit is contained in:
fan 2023-06-30 16:16:30 +08:00
commit 28119c0743
4 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
protos/device_info.proto
View File

@ -15,14 +15,14 @@ message Section {
// 区段类型
graphicData.Section.SectionType type = 3;
// 公里标
repeated graphicData.KilometerSystem kilometerSystem = 4;
// 关联区段
repeated Section children = 5;
repeated Section children = 4;
// 公里标
repeated graphicData.KilometerSystem kilometerSystem = 5;
// 转换后的公里标数字
repeated int64 convertKilometer = 6;
repeated int64 convertKilometer = 7;
}
// 道岔
@ -32,14 +32,10 @@ message Switch {
string code = 2;
graphicData.KilometerSystem switchKilometerSystem = 3;
int64 switchConvertKilometer = 4;
// 关联道岔的公里标
repeated graphicData.KilometerSystem kilometerSystem = 5;
repeated graphicData.KilometerSystem kilometerSystem = 3;
// 转换后的公里标数字
repeated int64 convertKilometer = 6;
repeated int64 convertKilometer = 4;
}

15
protos/stationLayoutGraphics.proto
View File

@ -153,13 +153,14 @@ message IscsFan {
message Turnout {
CommonInfo common = 1;
string code = 2;
repeated Point pointA = 6; // A端坐标列表
repeated Point pointB = 7; // B端坐标列表
repeated Point pointC = 8; // C端坐标列表
RelatedRef paRef = 9; // 道岔A端关联的设备
RelatedRef pbRef = 10; // 道岔B端关联的设备
RelatedRef pcRef = 11; // 道岔C端关联的设备
KilometerSystem kilometerSystem = 12; // 道岔公里标
repeated Point pointA = 6; // A端坐标列表
repeated Point pointB = 7; // B端坐标列表
repeated Point pointC = 8; // C端坐标列表
RelatedRef paRef = 9; // 道岔A端关联的设备
RelatedRef pbRef = 10; // 道岔B端关联的设备
RelatedRef pcRef = 11; // 道岔C端关联的设备
// KilometerSystem kilometerSystem = 12; // 道岔公里标
repeated KilometerSystem kilometerSystem = 13; // 道岔公里标
}
message KilometerSystem {

6
protos/train.proto
View File

@ -35,9 +35,9 @@ message TrainInfo {
// 列车状态
// int32 mode = 14;
state.TrainMode mode = 14;
// 到点
// 到点 时间戳 精确到秒 10位长度
int64 arriveTime = 15;
// 发点
// 发点 时间戳 精确到秒 10位长度
int64 departTime = 16;
// 速度
float speed = 17;
@ -145,7 +145,7 @@ message TrainRecord{
* true-到达，false-出发
*/
bool recordType = 12;
/** 到发时间(7) */
/** 到发时间(7) 时间戳 精确到秒 10位长度 */
int64 recordTime = 13;
}

9
protos/ws_message.proto
View File

@ -61,16 +61,13 @@ message WsLineNetTrainOffsetMessage {
// 车组号
string groupId = 3;
// 目的地ID
int32 destinationId = 4;
//是否显示
bool show = 5;
bool show = 4;
// 列车公里标
int64 kilometerCode = 6;
int64 kilometerCode = 5;
// 运行方向
int32 dir = 7;
int32 dir = 6;
}