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

This commit is contained in:
Yuan 2023-06-09 18:35:24 +08:00
commit 6c78a70743
3 changed files with 205 additions and 225 deletions

View File

@ -1,41 +0,0 @@
syntax = "proto3";
option java_package = "club.joylink.xiannccda.dto.protos";
option java_outer_classname = "DeviceProto";
message Device{
int32 lineId = 1;
int32 reportId = 2;
}
message DeviceDetail{
string deviceType = 1;
string deviceName = 2;
// int32 status = 3;
}
message Track{
Device device = 1;
DeviceDetail detail = 2;
//
float speedLimit = 3;
//
// 1CBTC限速
// 2
// 4
int32 limitType = 4;
}
message Platform{
Device device = 1;
DeviceDetail detail = 2;
//
int32 stopTime = 3;
}
message Switch{
Device device = 1;
DeviceDetail detail = 2;
//
float speedLimit = 3;
}

View File

@ -10,17 +10,11 @@ message LineNetTrainOffset{
string Group_id = 2; string Group_id = 2;
// //
int32 dir = 3; int32 dir = 3;
// true-false-
bool initType = 4;
//
int32 offset = 5;
//id
int32 destinationId = 6;
//
int32 backId = 7;
// //
bool show = 8; bool show = 4;
// //
float rate = 9; int32 windowNo = 5;
//
int32 windowOffset = 6;
} }

View File

@ -108,6 +108,8 @@ message Switch{
bool ipSingleSwitchStusLostIndication = 27; bool ipSingleSwitchStusLostIndication = 27;
// //
string id = 28; string id = 28;
//KM/H
int32 speedLimit = 29;
} }
message Track{ message Track{
@ -124,6 +126,14 @@ message Track{
bool blocked = 11; bool blocked = 11;
// //
string id = 12; string id = 12;
//
float speedLimit = 13;
//
// 1CBTC限速
// 2
// 4
int32 limitType = 14;
} }
message Platform{ message Platform{
@ -142,6 +152,10 @@ message Platform{
bool downTrainSkipstop = 13; bool downTrainSkipstop = 13;
// //
string id = 14; string id = 14;
//
int32 nextSectionRunTime = 15;
//
int32 nextSectionRunLevel = 16;
} }
message Scada{ message Scada{
@ -212,3 +226,16 @@ message TrainMode{
// //
string id = 35; string id = 35;
} }
//////////////////////////////////////////////////////////////////////
//2.7.2
//NCC FEP与OCC FEP
message OccNccFepNetwork{
//线
string id = 1;
//true 线(server)
//false
bool active = 2;
}