合并代码

This commit is contained in:
fan 2023-06-12 17:33:15 +08:00
commit 1649bf4b3f
5 changed files with 293 additions and 236 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

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

View File

@ -5,210 +5,246 @@ option java_package = "club.joylink.xiannccda.dto.protos";
option java_outer_classname = "DeviceStatusProto"; option java_outer_classname = "DeviceStatusProto";
message Rtu{ message Rtu{
bool ipRtuStusDown = 1; bool ipRtuStusDown = 1;
bool ipRtuStusInLocalCtrl = 2; bool ipRtuStusInLocalCtrl = 2;
bool ipRtuStusInCentralCtrl = 3; bool ipRtuStusInCentralCtrl = 3;
bool ipRtuStusInEmergencyCtrl = 4; bool ipRtuStusInEmergencyCtrl = 4;
// //
string id = 5; string id = 5;
} }
message Station{ message Station{
bool ipStaStusTermMode1 = 1; bool ipStaStusTermMode1 = 1;
bool ipStaStusTermMode2 = 2; bool ipStaStusTermMode2 = 2;
bool ipStaStusTermMode3 = 3; bool ipStaStusTermMode3 = 3;
bool ipStaStusTermMode4 = 4; bool ipStaStusTermMode4 = 4;
bool ipStaStusTermMode5 = 5; bool ipStaStusTermMode5 = 5;
bool ipStaStusTermMode6 = 6; bool ipStaStusTermMode6 = 6;
bool ipStaStusExpectTermMode1 = 7; bool ipStaStusExpectTermMode1 = 7;
bool ipStaStusExpectTermMode2 = 8; bool ipStaStusExpectTermMode2 = 8;
bool ipStaStusExpectTermMode3 = 9; bool ipStaStusExpectTermMode3 = 9;
bool ipStaStusExpectTermMode4 = 10; bool ipStaStusExpectTermMode4 = 10;
bool ipStaStusExpectTermMode5 = 11; bool ipStaStusExpectTermMode5 = 11;
bool ipStaStusExpectTermMode6 = 12; bool ipStaStusExpectTermMode6 = 12;
bool ipStaStusInCycle1 = 13; bool ipStaStusInCycle1 = 13;
bool ipStaStusInCycle2 = 14; bool ipStaStusInCycle2 = 14;
bool ipStaStusInCycle3 = 15; bool ipStaStusInCycle3 = 15;
bool ipStaStusInCycle4 = 16; bool ipStaStusInCycle4 = 16;
bool ipStaStusInCycle5 = 17; bool ipStaStusInCycle5 = 17;
bool ipStaStusInCycle6 = 18; bool ipStaStusInCycle6 = 18;
bool ipStaStusExpectCycle1 = 19; bool ipStaStusExpectCycle1 = 19;
bool ipStaStusExpectCycle2 = 20; bool ipStaStusExpectCycle2 = 20;
bool ipStaStusExpectCycle3 = 21; bool ipStaStusExpectCycle3 = 21;
bool ipStaStusExpectCycle4 = 22; bool ipStaStusExpectCycle4 = 22;
bool ipStaStusExpectCycle5 = 23; bool ipStaStusExpectCycle5 = 23;
bool ipStaStusExpectCycle6 = 24; bool ipStaStusExpectCycle6 = 24;
// //
string id = 25; string id = 25;
} }
message Signal{ message Signal{
bool redOpen = 1; bool redOpen = 1;
bool redFlash = 2; bool redFlash = 2;
bool greenOpen = 3; bool greenOpen = 3;
bool greenFlash = 4; bool greenFlash = 4;
bool yellowOpen = 5; bool yellowOpen = 5;
bool yellowFlash = 6; bool yellowFlash = 6;
bool whiteOpen = 7; bool whiteOpen = 7;
bool whiteFlash = 8; bool whiteFlash = 8;
bool blueOpen = 9; bool blueOpen = 9;
bool blueFlash = 10; bool blueFlash = 10;
bool fleetMode = 11; bool fleetMode = 11;
bool ctrlFleetMode = 12; bool ctrlFleetMode = 12;
bool autoMode = 13; bool autoMode = 13;
bool ctrlAutoMode = 14; bool ctrlAutoMode = 14;
bool extinguish = 15; bool extinguish = 15;
bool approachLock = 16; bool approachLock = 16;
bool protectRoute = 17; bool protectRoute = 17;
bool autoRouteDisable = 18; bool autoRouteDisable = 18;
bool callon = 19; bool callon = 19;
bool yellowYellow = 20; bool yellowYellow = 20;
bool yellowGreen = 21; bool yellowGreen = 21;
bool blocked = 22; bool blocked = 22;
bool lampFailure = 23; bool lampFailure = 23;
// //
string id = 24; string id = 24;
} }
message Entry{ message Entry{
bool dirLeft = 1; bool dirLeft = 1;
bool dirRight = 2; bool dirRight = 2;
bool dirLocked = 3; bool dirLocked = 3;
// //
string id = 4; string id = 4;
} }
message Switch{ message Switch{
bool ipSingleSwitchStusCiOccupied = 1; bool ipSingleSwitchStusCiOccupied = 1;
bool ipSingleSwitchStusCbtcOccupied = 2; bool ipSingleSwitchStusCbtcOccupied = 2;
bool ipSingleSwitchStusLocked = 3; bool ipSingleSwitchStusLocked = 3;
bool ipSingleSwitchStusFailLocked = 4; bool ipSingleSwitchStusFailLocked = 4;
bool ipSingleSwitchStusNormal = 5; bool ipSingleSwitchStusNormal = 5;
bool ipSingleSwitchStusReverse = 6; bool ipSingleSwitchStusReverse = 6;
bool ipSingleSwitchStusBlocked1 = 7; bool ipSingleSwitchStusBlocked1 = 7;
bool ipSingleSwitchStusJammed = 8; bool ipSingleSwitchStusJammed = 8;
bool ipSingleSwitchStusExpectLock = 9; bool ipSingleSwitchStusExpectLock = 9;
bool ipSingleSwitchStusExpectUnlock = 10; bool ipSingleSwitchStusExpectUnlock = 10;
bool ipSingleSwitchStusExpectNormal = 11; bool ipSingleSwitchStusExpectNormal = 11;
bool ipSingleSwitchStusExpectReverse = 12; bool ipSingleSwitchStusExpectReverse = 12;
bool ipSingleSwitchStusExpectBlock = 13; bool ipSingleSwitchStusExpectBlock = 13;
bool ipSingleSwitchStusExpectUnblock = 14; bool ipSingleSwitchStusExpectUnblock = 14;
bool ipSingleSwitchStusInRoute = 15; bool ipSingleSwitchStusInRoute = 15;
bool ipSingleSwitchStusManualMode = 16; bool ipSingleSwitchStusManualMode = 16;
bool ipSingleSwitchStusCut = 17; bool ipSingleSwitchStusCut = 17;
bool ipSingleSwitchStusAtcInvalid = 18; bool ipSingleSwitchStusAtcInvalid = 18;
bool ipSingleSwitchStusOverlap = 19; bool ipSingleSwitchStusOverlap = 19;
bool ipSingleSwitchStusTsrCbtcMain = 20; bool ipSingleSwitchStusTsrCbtcMain = 20;
bool ipSingleSwitchStusTsrCbtcNormal = 21; bool ipSingleSwitchStusTsrCbtcNormal = 21;
bool ipSingleSwitchStusTsrCbtcReverse = 22; bool ipSingleSwitchStusTsrCbtcReverse = 22;
bool ipSingleSwitchStusTsrBmMain = 23; bool ipSingleSwitchStusTsrBmMain = 23;
bool ipSingleSwitchStusTsrBmNormal = 24; bool ipSingleSwitchStusTsrBmNormal = 24;
bool ipSingleSwitchStusTsrBmReverse = 25; bool ipSingleSwitchStusTsrBmReverse = 25;
bool ipSingleSwitchStusBlocked2 = 26; bool ipSingleSwitchStusBlocked2 = 26;
bool ipSingleSwitchStusLostIndication = 27; bool ipSingleSwitchStusLostIndication = 27;
// //
string id = 28; string id = 28;
//KM/H
int32 speedLimit = 29;
} }
message Track{ message Track{
bool ciOccupied = 1; bool ciOccupied = 1;
bool cbtcOccupied = 2; bool cbtcOccupied = 2;
bool locked = 3; bool locked = 3;
bool failLocked = 4; bool failLocked = 4;
bool expectLock = 5; bool expectLock = 5;
bool expectUnlock = 6; bool expectUnlock = 6;
bool inRoute = 7; bool inRoute = 7;
bool cut = 8; bool cut = 8;
bool atcInvalid = 9; bool atcInvalid = 9;
bool overlap = 10; bool overlap = 10;
bool blocked = 11; bool blocked = 11;
// //
string id = 12; string id = 12;
//
int32 speedLimit = 13;
//
LimitType limitType = 14;
//track限速类型
enum LimitType{
Unknown = 0;
//1CBTC限速
Cbtc = 1;
//2
Interlock = 2;
//4
CbtcInterlock = 4;
}
} }
message Platform{ message Platform{
bool emergstop = 1; bool emergstop = 1;
bool trainberth = 2; bool trainberth = 2;
bool close = 3; bool close = 3;
bool upHold = 4; bool upHold = 4;
bool downHold = 5; bool downHold = 5;
bool upOccHold = 6; bool upOccHold = 6;
bool downOccHold = 7; bool downOccHold = 7;
bool psdOpen = 8; bool psdOpen = 8;
bool psdCut = 9; bool psdCut = 9;
bool upSkipstop = 10; bool upSkipstop = 10;
bool downSkipstop = 11; bool downSkipstop = 11;
bool upTrainSkipstop = 12; bool upTrainSkipstop = 12;
bool downTrainSkipstop = 13; bool downTrainSkipstop = 13;
// //
string id = 14; string id = 14;
//
int32 nextSectionRunTime = 15;
//
int32 nextSectionRunLevel = 16;
//
int32 stopTime = 17;
} }
message Scada{ message Scada{
bool scadaOn = 1; bool scadaOn = 1;
bool scadaSinglePower = 2; bool scadaSinglePower = 2;
bool scadaUnkown = 3; bool scadaUnkown = 3;
// //
string id = 4; string id = 4;
} }
message WaterProofDoor{ message WaterProofDoor{
bool doorClosed = 1; bool doorClosed = 1;
bool doorExpectClose = 2; bool doorExpectClose = 2;
bool doorAgreeClosed = 3; bool doorAgreeClosed = 3;
bool doorClosing = 4; bool doorClosing = 4;
bool doorOpenLock = 5; bool doorOpenLock = 5;
// //
string id = 6; string id = 6;
} }
message WorkArea{ message WorkArea{
bool ipStusWorkAreaEnable = 1; bool ipStusWorkAreaEnable = 1;
// //
string id = 2; string id = 2;
} }
message Gama{ message Gama{
bool ipStusGamaDisable = 1; bool ipStusGamaDisable = 1;
// //
string id = 2; string id = 2;
} }
message TrainMode{ message TrainMode{
bool ipModeTrainTypeManual = 1; bool ipModeTrainTypeManual = 1;
bool ipModeTrainTypeHead = 2; bool ipModeTrainTypeHead = 2;
bool ipModeTrainTypeSpecial = 3; bool ipModeTrainTypeSpecial = 3;
bool ipModeTrainTypeSchedule = 4; bool ipModeTrainTypeSchedule = 4;
bool ipModeTrainTypeRoute = 5; bool ipModeTrainTypeRoute = 5;
bool ipModeTrainTypeShuttle = 6; bool ipModeTrainTypeShuttle = 6;
bool ipModeTrainTypeLineup = 7; bool ipModeTrainTypeLineup = 7;
bool ipModeTrainSchdEarly = 8; bool ipModeTrainSchdEarly = 8;
bool ipModeTrainSchdLate = 9; bool ipModeTrainSchdLate = 9;
bool ipModeTrainSkipstop = 10; bool ipModeTrainSkipstop = 10;
bool ipModeTrainCbtcMode = 11; bool ipModeTrainCbtcMode = 11;
bool ipModeTrainAtpCut = 12; bool ipModeTrainAtpCut = 12;
bool ipModeTrainBerthed = 13; bool ipModeTrainBerthed = 13;
bool ipModeTrainStoped = 14; bool ipModeTrainStoped = 14;
bool ipModeTrainHolded = 15; bool ipModeTrainHolded = 15;
bool ipModeTrainItama = 16; bool ipModeTrainItama = 16;
bool ipModeTrainDirUp = 17; bool ipModeTrainDirUp = 17;
bool ipModeTrainDirDown = 18; bool ipModeTrainDirDown = 18;
bool ipModeTrainDirHeadUp = 19; bool ipModeTrainDirHeadUp = 19;
bool ipModeTrainDirHeadDown = 20; bool ipModeTrainDirHeadDown = 20;
bool ipModeTrainDoorOpen = 21; bool ipModeTrainDoorOpen = 21;
bool ipModeTrainRsAlarm = 22; bool ipModeTrainRsAlarm = 22;
bool ipModeTrainDoorAlarm = 23; bool ipModeTrainDoorAlarm = 23;
bool ipModeTrainEbAlarm = 24; bool ipModeTrainEbAlarm = 24;
bool ipModeTrainIntegrityAlarm = 25; bool ipModeTrainIntegrityAlarm = 25;
bool ipModeTrainDriveModeAm = 26; bool ipModeTrainDriveModeAm = 26;
bool ipModeTrainDriveModeCm = 27; bool ipModeTrainDriveModeCm = 27;
bool ipModeTrainDriveModeRmf = 28; bool ipModeTrainDriveModeRmf = 28;
bool ipModeTrainDriveModeDto = 29; bool ipModeTrainDriveModeDto = 29;
bool ipModeTrainDriveModeAtb = 30; bool ipModeTrainDriveModeAtb = 30;
bool ipModeTrainDriveBlockAm = 31; bool ipModeTrainDriveBlockAm = 31;
bool ipModeTrainDriveBlockCm = 32; bool ipModeTrainDriveBlockCm = 32;
bool ipModeTrainDriveModeRmr = 33; bool ipModeTrainDriveModeRmr = 33;
bool ipModeTrainDriveModeWash = 34; bool ipModeTrainDriveModeWash = 34;
// //
string id = 35; string id = 35;
} }
//////////////////////////////////////////////////////////////////////
//2.7.2
//NCC FEP与OCC FEP
message OccNccFepNetwork{
//线
string id = 1;
//true 线(server)
//false
bool active = 2;
}

View File

@ -10,11 +10,14 @@ message RtssGraphicStorage {
repeated IscsFan iscsFans = 3; repeated IscsFan iscsFans = 3;
repeated Platform Platforms = 4; repeated Platform Platforms = 4;
repeated Station stations = 5; repeated Station stations = 5;
repeated Rect Rects = 6; repeated Rect rects = 6;
repeated Train train = 7; repeated Train train = 7;
repeated Signal signals = 8; repeated Signal signals = 8;
repeated Turnout turnouts = 9; repeated Turnout turnouts = 9;
repeated RunLine runLines = 10; repeated Section section = 10;
repeated StationLine stationLines = 11;
repeated RunLine runLines = 12;
} }
message Canvas { message Canvas {
@ -77,17 +80,17 @@ message Rect {
string code = 2; string code = 2;
int32 lineWidth = 3; // 线 int32 lineWidth = 3; // 线
string lineColor = 4; // 线 string lineColor = 4; // 线
Point point = 5; // float width = 5; //
float width = 6; // float height = 6; //
float height = 7; // int32 radius = 7; //
repeated Point points = 8; // Point point = 8; //
} }
message Platform { message Platform {
CommonInfo common = 1; CommonInfo common = 1;
string code = 2; string code = 2;
bool hasdoor = 3; // bool hasdoor = 3; //
string direction = 4; // -- string direction = 4; // --
} }
message Station { message Station {
@ -95,6 +98,12 @@ message Station {
string code = 2; string code = 2;
} }
message StationLine {
CommonInfo common = 1;
string code = 2;
bool hasTransfer = 3; //
}
message Train { message Train {
CommonInfo common = 1; CommonInfo common = 1;
string code = 2; string code = 2;
@ -126,5 +135,10 @@ message RunLine {
string code = 2; string code = 2;
repeated Point points = 3; repeated Point points = 3;
string nameColor = 4; string nameColor = 4;
string nameBgColor = 5; string nameBgColor = 5;}
message Section {
CommonInfo common = 1;
string code = 2;
repeated Point points = 3;
} }

50
protos/trans.proto Normal file
View File

@ -0,0 +1,50 @@
syntax = "proto3";
//
package trans;
import "device_status.proto";
option java_package = "club.joylink.xiannccda.dto.protos";
option java_outer_classname = "TransProto";
//线
message RtuDevicesStorage{
//线
int32 lineId = 1;
//
int32 rtuId = 2;
//true-;false-
bool all = 3;
//
repeated state.Signal signal = 4;
//
repeated state.Switch switch = 5;
//
repeated state.Platform platform = 6;
//
repeated state.Track track =7;
//
repeated state.Rtu rtu = 8;
//
repeated state.Station station = 9;
//
repeated state.Entry entry = 10;
//
repeated state.Scada scada = 11;
//
repeated state.WaterProofDoor waterProofDoor = 12;
//
repeated state.WorkArea workArea = 13;
//
repeated state.Gama gama = 14;
}
//线
message LineDevicesStorage{
//线
int32 lineId = 1;
//true-线;false-
bool all = 2;
//线
repeated RtuDevicesStorage storage = 3;
}