Merge remote-tracking branch 'origin/master'

This commit is contained in:
joylink_zhangsai 2023-07-14 10:21:48 +08:00
commit f34687558e
3 changed files with 59 additions and 62 deletions

View File

@ -26,7 +26,7 @@ message Section {
}
//
message Switch {
message Turnout {
string id = 1;

View File

@ -3,7 +3,7 @@ syntax = "proto3";
package state; //
option java_package = "club.joylink.xiannccda.dto.protos";
option java_outer_classname = "DeviceStatusProto";
enum DeviceType{
enum DeviceType {
UNKNOW = 0;
RTU = 1;
STATION = 2;
@ -12,14 +12,13 @@ enum DeviceType{
TRACK = 5;
ENTRY = 6;
PLATFORM = 7;
SCADA = 8;
WATERPROOF_DOOR = 9;
WORK_AREA = 10;
GAMA = 11;
SCADA = 9;
WATERPROOF_DOOR = 11;
WORK_AREA = 12;
GAMA = 13;
}
message Rtu{
message Rtu {
bool ipRtuStusDown = 1;
bool ipRtuStusInLocalCtrl = 2;
bool ipRtuStusInCentralCtrl = 3;
@ -28,7 +27,7 @@ message Rtu{
string id = 5;
}
message Station{
message Station {
bool ipStaStusTermMode1 = 1;
bool ipStaStusTermMode2 = 2;
bool ipStaStusTermMode3 = 3;
@ -57,7 +56,7 @@ message Station{
string id = 25;
}
message Signal{
message Signal {
bool redOpen = 1;
bool redFlash = 2;
bool greenOpen = 3;
@ -85,7 +84,7 @@ message Signal{
string id = 24;
}
message Entry{
message Entry {
bool dirLeft = 1;
bool dirRight = 2;
bool dirLocked = 3;
@ -93,41 +92,41 @@ message Entry{
string id = 4;
}
message Switch{
bool ipSingleSwitchStusCiOccupied = 1;
bool ipSingleSwitchStusCbtcOccupied = 2;
bool ipSingleSwitchStusLocked = 3;
bool ipSingleSwitchStusFailLocked = 4;
bool ipSingleSwitchStusNormal = 5;
bool ipSingleSwitchStusReverse = 6;
bool ipSingleSwitchStusBlocked1 = 7;
bool ipSingleSwitchStusJammed = 8;
bool ipSingleSwitchStusExpectLock = 9;
bool ipSingleSwitchStusExpectUnlock = 10;
bool ipSingleSwitchStusExpectNormal = 11;
bool ipSingleSwitchStusExpectReverse = 12;
bool ipSingleSwitchStusExpectBlock = 13;
bool ipSingleSwitchStusExpectUnblock = 14;
bool ipSingleSwitchStusInRoute = 15;
bool ipSingleSwitchStusManualMode = 16;
bool ipSingleSwitchStusCut = 17;
bool ipSingleSwitchStusAtcInvalid = 18;
bool ipSingleSwitchStusOverlap = 19;
bool ipSingleSwitchStusTsrCbtcMain = 20;
bool ipSingleSwitchStusTsrCbtcNormal = 21;
bool ipSingleSwitchStusTsrCbtcReverse = 22;
bool ipSingleSwitchStusTsrBmMain = 23;
bool ipSingleSwitchStusTsrBmNormal = 24;
bool ipSingleSwitchStusTsrBmReverse = 25;
bool ipSingleSwitchStusBlocked2 = 26;
bool ipSingleSwitchStusLostIndication = 27;
message Switch {
bool ipSingleSwitchStusCiOccupied = 1; //
bool ipSingleSwitchStusCbtcOccupied = 2; // CBTC报告道岔占用
bool ipSingleSwitchStusLocked = 3; //
bool ipSingleSwitchStusFailLocked = 4; //
bool ipSingleSwitchStusNormal = 5; //
bool ipSingleSwitchStusReverse = 6; //
bool ipSingleSwitchStusBlocked1 = 7; //
bool ipSingleSwitchStusJammed = 8; //
// bool ipSingleSwitchStusExpectLock = 9; //
// bool ipSingleSwitchStusExpectUnlock = 10; //
// bool ipSingleSwitchStusExpectNormal = 11; //
// bool ipSingleSwitchStusExpectReverse = 12; //
// bool ipSingleSwitchStusExpectBlock = 13; //
// bool ipSingleSwitchStusExpectUnblock = 14; //
// bool ipSingleSwitchStusInRoute = 15; //
// bool ipSingleSwitchStusManualMode = 16; //
bool ipSingleSwitchStusCut = 17; //
bool ipSingleSwitchStusAtcInvalid = 18; // ATC报告失效
bool ipSingleSwitchStusOverlap = 19; // OVERLAP
bool ipSingleSwitchStusTsrCbtcMain = 20; // CBTC岔前限速
bool ipSingleSwitchStusTsrCbtcNormal = 21; // CBTC定位限速
bool ipSingleSwitchStusTsrCbtcReverse = 22; // CBTC反位限速
bool ipSingleSwitchStusTsrBmMain = 23; // BM岔前限速
bool ipSingleSwitchStusTsrBmNormal = 24; // BM定位限速
bool ipSingleSwitchStusTsrBmReverse = 25; // BM反位限速
bool ipSingleSwitchStusBlocked2 = 26; //
bool ipSingleSwitchStusLostIndication = 27; //
//
string id = 28;
//KM/H
int32 speedLimit = 29;
}
message Track{
message Track {
bool ciOccupied = 1;
bool cbtcOccupied = 2;
bool locked = 3;
@ -146,8 +145,8 @@ message Track{
//
LimitType limitType = 14;
//track限速类型
enum LimitType{
// track限速类型
enum LimitType {
Unknown = 0;
//1CBTC限速
Cbtc = 1;
@ -158,7 +157,7 @@ message Track{
}
}
message Platform{
message Platform {
bool emergstop = 1;
bool trainberth = 2;
bool close = 3;
@ -182,7 +181,7 @@ message Platform{
int32 stopTime = 17;
}
message Scada{
message Scada {
bool scadaOn = 1;
bool scadaSinglePower = 2;
bool scadaUnkown = 3;
@ -190,7 +189,7 @@ message Scada{
string id = 4;
}
message WaterProofDoor{
message WaterProofDoor {
bool doorClosed = 1;
bool doorExpectClose = 2;
bool doorAgreeClosed = 3;
@ -200,19 +199,19 @@ message WaterProofDoor{
string id = 6;
}
message WorkArea{
message WorkArea {
bool ipStusWorkAreaEnable = 1;
//
string id = 2;
}
message Gama{
message Gama {
bool ipStusGamaDisable = 1;
//
string id = 2;
}
message TrainMode{
message TrainMode {
bool ipModeTrainTypeManual = 1;
bool ipModeTrainTypeHead = 2;
bool ipModeTrainTypeSpecial = 3;
@ -253,15 +252,12 @@ message TrainMode{
//////////////////////////////////////////////////////////////////////
//2.7.2
//NCC FEP与OCC FEP
message OccNccFepNetwork{
// 2.7.2
// NCC FEP与OCC FEP
message OccNccFepNetwork {
//线
string id = 1;
//true 线(server)
//false
// true 线(server)
// false
bool active = 2;
}

View File

@ -200,10 +200,10 @@ message Section {
CommonInfo common = 1;
string code = 2;
repeated Point points = 3;
RelatedRef paRef = 4; // A端关联的设备
RelatedRef pbRef = 5; // B端关联的设备
RelatedRef paRef = 4; // A端关联的设备()
RelatedRef pbRef = 5; // B端关联的设备()
SectionType sectionType = 6; //
repeated string children = 7; // /
repeated string axleCountings = 7; //
}
message KilometerPoint {
@ -218,6 +218,7 @@ message PathLine {
repeated Point points = 3;
bool isUp = 4;
repeated KilometerPoint kilometerPoints = 5;
bool aToB = 6;
}
//