Compare commits

..

1 Commits

Author SHA1 Message Date
tiger_zhou
6bc00faaa1 动力学列车数据配置 2024-01-17 13:09:43 +08:00
7 changed files with 219 additions and 1067 deletions

View File

@ -1,76 +0,0 @@
syntax = "proto3";
package common;
//option java_package = "club.joylink.bjrtss.ats.verify.protos";
//option java_outer_classname = "LayoutGraphicsProto";
option go_package = "joylink.club/bj-rtsts-server/dto/common_proto";
//
message TrainDynamicConfig{
//100=1ton
// int32 mass=1;
//A
float davisParamA=1;
// B
float davisParamB=2;
// C
float davisParamC=3;
//线R1
float curveResistanceParamR1=4;
// 线R2
float curveResistanceParamR2=5;
// 线R3
float curveResistanceParamR3=6;
// 线R4
float curveResistanceParamR4=7;
//
float revolvingMassParam=8;
//
bool jump=9;
//(m/s) 0
float slipA=10;
// (m/s) 0
float slipR=11;
// ms 0
int32 slipD=12;
// m/s20
float idlingA = 14;
// m/s30
float idlingR = 15;
// ms0
int32 idlingD = 16;
///mm
int32 stopSign=17;
///m/s0
float slide = 18;
}
//
message TrainEndsState{
//
bool speedSensorEnableA = 1;
bool speedSensorEnableB = 2;
//
bool radarEnable = 3;
///
float radarCheckSpeedDiff = 4;
//()
int32 radarCheckTime = 5;
//
bool accEnable = 6;
///
float accCheckSpeedDiff = 7;
//
int32 accCheckTime = 8;
// /
int32 accOutSpeed = 9;
// /
int32 radarOutSpeed = 10;
//
int64 radarCheckTimeOverAt = 11;
//
int64 accCheckTimeOverAt = 12;
}

View File

@ -1,13 +1,10 @@
syntax = "proto3";
import "stationLayoutGraphics.proto";
import "common_data.proto";
import "request.proto";
package state;
option java_package = "club.joylink.bjrtss.ats.verify.protos";
option java_outer_classname = "DeviceStateProto";
option go_package = "joylink.club/bj-rtsts-server/dto/state_proto";
//option go_package = "dto/state_proto;";
//
@ -31,7 +28,7 @@ message LinkState{
repeated string trainId = 2;
}
//
//
message SectionState{
//
uint32 id = 1;
@ -40,16 +37,6 @@ message SectionState{
bool occupied = 3;
//
bool axleFault = 4;
//
bool axleDrst = 5;
//
bool axlePdrst = 6;
}
//
message AxleCountingSectionState {
uint32 id = 1;
bool occupied = 2;
}
//
@ -64,22 +51,30 @@ message SwitchState{
bool dw = 4;
//
bool fw = 5;
//
request.PointsParam param = 6;
// ()
bool force = 6;
//
bool sb = 7;
//
bool dwsb = 8;
//
bool fwsb = 9;
//
bool jc = 10;
//
bool qdc = 7;
bool qdc = 11;
//
bool qfc = 8;
bool qfc = 12;
//
bool qyc = 9;
//
bool dc = 10;
//
bool fc = 11;
//
bool yc = 12;
bool qyc = 13;
//
bool dc = 14;
//
bool fc = 15;
//
bool yc = 16;
//
bool occupied = 13;
bool occupied = 17;
}
//
message SignalState{
@ -87,29 +82,27 @@ message SignalState{
uint32 id = 1;
//
Signal.Aspect aspect = 2;
//
request.SignalParam param = 3;
//
map<string, bool> relayStateMap = 4;
}
//
message Signal {
//
enum Aspect {
//
OFF = 0;
//
H = 1;
//
Non = 0;
//
OFF = 1;
//绿
L = 2;
//
H = 3;
//
U = 3;
U = 4;
//
HU = 4;
HU = 5;
//
B = 5;
B = 6;
//
A = 6;
A = 7;
}
}
@ -129,22 +122,6 @@ message StationState{
//
uint32 id = 1;
}
//
message TrainConnState{
bool conn = 1;//
TrainConnType connType = 2;
uint32 TrainControlMapId = 3; //mapId
string typeName = 4;//
// map<string, SensorSpeedPulseCount> speedPulseCountMap = 5;//
enum TrainConnType{
NONE = 0;//
VOBC = 1; //
PC_SIM = 2; //PC仿真
/*PC_SIM_A = 3; //PC仿真
PC_SIM_B = 4; //PC仿真*/
}
}
//
message TrainState{
//
@ -155,7 +132,7 @@ message TrainState{
float speed = 3;
//,1=1mm
int64 trainLength = 4;
//false
//
bool show = 5;
// ID
uint32 headDeviceId = 6;
@ -163,12 +140,12 @@ message TrainState{
int64 headOffset = 7;
//
string devicePort = 8;
// (A-B,-> )
bool driftTo = 9;
// -> ->
bool trainRunUp = 10;
// 0=1= -> ,2= ->
uint32 trainActiveDirection = 11;
// (A-B,-> )
bool pointTo = 9;
// -> ->
bool runDirection = 10;
//
bool headDirection = 11;
//
TrainDynamicState dynamicState = 12;
//
@ -179,67 +156,6 @@ message TrainState{
int64 controlDelayTime = 15;
//
int32 wheelDiameter = 16;
//
common.TrainDynamicConfig trainDynamicConfig = 17;
//A端
common.TrainEndsState trainEndsA = 18;
//B端
common.TrainEndsState trainEndsB = 19;
// ID
uint32 tailDeviceId = 20;
//
int64 tailOffset = 21;
//
string tailDevicePort = 22;
// BTM状态 -- 2024-08-12
// BTMState btmState = 23;
TrainControlState tcc = 24;
TrainConnState connState = 25; //
// SensorSpeedPulseCount pluseCount = 26;
// VobcBtmState vobcBtm = 27;//vobc btm
string oldLink = 28;
int64 oldLinkOffset = 29;
string oldTailLink = 30;
int64 oldTailLinkOffset = 31;
TrainBtmCache btmBaliseCacheA = 32; //
TrainBtmCache btmBaliseCacheB = 33; //
int32 TrainLoad = 34; //
float TrainMaxSpeed = 35; //
float TrainMaxAcc = 36; //
float TrainMaxBrake = 37; //
float TrainEmergencyBrake = 38;//
string projectCode = 39;
// TrainBtmCache BtmBaliseCache = 40;
TrainPort trainPort = 40; //
map<int32,SensorSpeedPulseCount> pulseCountMap = 41; // key = TrainPort
uint32 trainCoachNum = 42 ;//
enum TrainPort{
PORT_NONE = 0;
PORT_A=1;
PORT_B=2;
}
// map<bool,TrainVobcState> trainPortVS = 40;
}
//
message TrainBtmCache{
uint32 dsn = 1;
uint32 baliseCount = 2; //)0~255
uint32 messageCounter = 3; // ()0~255
string resendBaliseId = 4;
repeated BTMState baliseList = 5;
}
//
message SensorSpeedPulseCount{
uint32 pulseCount1 = 1;
// uint32 pulseCount2 = 2;
repeated float pulseCount3 = 3;
// repeated float pulseCount4 = 4;
}
//
@ -263,39 +179,82 @@ message TrainDynamicState {
bool upslope = 8;
//,1 =true 0 =false
bool runningUp = 9;
//NtotalResistance,1=1N
//NtotalResistance,1=1KN
float runningResistanceSum = 10;
//1NairResistance,1=1N
//1NairResistance,1=1KN
float airResistance = 11;
//2NslopeResistance,1=1N
//2NslopeResistance,1=1KN
float rampResistance = 12;
//3线NcurveResistance,1=1N
//3线NcurveResistance,1=1KN
float curveResistance = 13;
//m/sspeed,1=1m/s km/h
//m/sspeed,1=1km/h
int32 speed = 14;
//1m/sheadSpeed1,1=1m/s km/h
//1m/sheadSpeed1,1=1km/h
int32 headSensorSpeed1 = 15;
//2m/sheadSpeed2,1=1m/s km/h
//2m/sheadSpeed2,1=1km/h
int32 headSensorSpeed2 = 16;
//1m/stailSpeed1,1=1m/s km/h
//1m/stailSpeed1,1=1km/h
int32 tailSensorSpeed1 = 17;
//2m/stailSpeed2,1=1m/s km/h
//2m/stailSpeed2,1=1km/h
int32 tailSensorSpeed2 = 18;
//m/sheadRadarSpeed,1=1m/s km/h
//m/sheadRadarSpeed,1=1km/h
int32 headRadarSpeed = 19;
//m/stailRadarSpeed,1=1m/s km/h
//m/stailRadarSpeed,1=1km/h
int32 tailRadarSpeed = 20;
//
bool udpInterruption = 21;
//
float acceleration = 22;
//
// int32 Displacement = 23;
float Displacement = 23;
TrainDynamicConfig trainDynamicConfig = 23;
}
//
message TrainDynamicConfig{
//100=1ton
int32 mass=1;
//A
float baseResistanceParamA=2;
// B
float baseResistanceParamB=3;
// C
float baseResistanceParamC=4;
//线R1
float curveResistanceParamR1=5;
// 线R2
float curveResistanceParamR2=6;
// 线R3
float curveResistanceParamR3=7;
// 线R4
float curveResistanceParamR4=8;
//
float revolvingMassParam=9;
//
bool jump=10;
//%
float slip=11;
///mm
int32 slide = 12;
///mm
int32 stopSign=13;
//A端
TrainEndsState trainEndsA = 14;
//B端
TrainEndsState trainEndsB = 15;
}
//
message TrainEndsState{
//
repeated bool speedSensorEnable = 1;
//
bool radarEnable = 2;
//
float radarCheckSpeed = 3;
//()
int32 radarCheckTime = 4;
}
// vobc发过来的列车信息 ()
// vobc发过来的列车信息
message TrainVobcState {
// +1
int32 lifeSignal = 1;
@ -349,144 +308,6 @@ message TrainVobcState {
bool udpInterruption = 25;
//
int64 updateTime = 26;
//
bool forceDoorAllow = 27;
//
bool modeLevelDownBtn = 28;
//
bool confirmBtn = 29;
//
bool modeLevelUpBtn = 30;
// ATO发车按钮
bool atoSendTrainBtn = 31;
//
// bool trainIntegrity = 32;
// ATP/ATO旁路状态
bool atpOrAtoBypassState = 33;
//
bool trainTractionCuted = 34;
//
bool obstacleCheckBtn = 35;
//
// bool driverActiveReportBtn = 36;
//
bool brakeHeavyFault = 37;
//
bool leftDoorState = 38;
//
bool rightDoorState = 39;
//
bool wakeUpBtn = 40;
//
bool overhaulBtn = 41;
//
bool undervoltageBtn = 42;
//
bool sleepBtn = 43;
//
bool emergentHandleDown = 44;
//
bool doorLockState =45;
//
bool lifeDoorState=46;
//
bool trainLowPowerResetState=47;
// ATP上电按钮
bool atpPowerOnBtn=48;
// AA自动开关门
bool doorModeAA=49;
//AM自开人关
bool doorModeAM=50;
// MM人开人关
bool doorModeMM=51;
//
// bool outerEmergentBrakeReport = 52;
//
bool trainDoorOutLed = 53;
//ATP控车
bool localAtpControl = 54;
//ATO制动命令输出
bool atoBrakeCommand = 55;
// ATO牵引命令输出
bool atoTractionCommandOut = 56;
//ATO惰行命令输出
bool atoLazyCommandOut = 57;
//// AR灯命令
// bool arLightCommand = 58;
//ATO保持制动
bool atoAlwaysBrake=59;
//ATO开左门
bool atoOpenLeftDoor=60;
//ATO开右门
bool atoOpenRightDoor=61;
//ATO关左门
bool atoCloseLeftDoor=62;
//
bool noSpeedSigle = 63;
//
bool trainStartedLed = 64;
//
bool mostUseBrake = 65;
//
bool splittingOut = 66;
//
bool modeRelay = 67;
//
bool tractionEffective=68;
//
bool brakeEffective=69;
//
bool brakeQuarantine=70;
//
bool stopNotAllBrake=71;
// ATO牵引指令1
bool atoTractionCommand1 = 72;
// ATO牵引指令2
bool atoTractionCommand2=73;
// ATO牵引指令3
bool atoTractionCommand3=74;
uint32 mockInfo = 75; //
// atp
bool atpCutSwitch = 76;
//
bool lightEmergencyBrakingStatus = 77;
//
bool lightTractionSafetyCircuit = 78;
//1
bool lightDir1 = 79;
//2
bool lightDir2 = 80;
//
bool lightDriverActive = 81;
//
bool trainConnInitComplate = 82;
//ato关右门
bool atoCloseRightDoor = 83;
bool lightAtoSend = 84;
//Ato运行级位
AtoStepLevel atoStepLevel = 85;
VobcBtmInfo vobcBtmInfo = 86;
// int64 lineInitTimeStamp12 = 87; //12线
// bool line12ConnErr = 88;//12线12线atp故障atp需要重启atp状态情况(atp故障时atp输出数字量返回的数据最后一个直接是0)
// bool trainConnInitComplateTc1 = 87;
// bool trainConnInitComplateTc2 = 88;
message VobcBtmInfo{
uint32 btmId = 1;
uint32 vobcId = 2;
uint32 vobcLifeId = 3;
}
enum AtoStepLevel{
ATO_STEP_LEVEL_NONE=0;
ATO_STEP_LEVEL_1 = 1;
ATO_STEP_LEVEL_2 = 2;
ATO_STEP_LEVEL_3 = 3;
ATO_STEP_LEVEL_4 = 4;
ATO_STEP_LEVEL_5 = 5;
ATO_STEP_LEVEL_6 = 6;
ATO_STEP_LEVEL_7 = 7;
}
}
//
@ -508,15 +329,11 @@ message TrainMapState{
//
string devicePort = 8;
// (A-B,-> )
// bool pointTo = 9;
bool driftTo = 9;
bool pointTo = 9;
// -> ->
// bool runDirection = 10;
bool trainRunUp = 10;
bool runDirection = 10;
//
// bool headDirection = 11;
// 0= 1=2=
uint32 trainActiveDirection = 11;
bool headDirection = 11;
//
int64 trainKilometer = 12;
//
@ -620,103 +437,8 @@ message TrainMapState{
bool allDoorClose = 60;
//
bool vobcInterruption = 61;
//
TrainDynamicConfigMqtt trainDynamicConfig = 62;
//A端
TrainEndsStateMqtt trainEndsA = 63;
//B端
TrainEndsStateMqtt trainEndsB = 64;
//
// int32 Displacement = 65;
float Displacement = 65;
// ID
uint32 tailDeviceId = 66;
//
int64 tailOffset = 67;
//
string tailDevicePort = 68;
// BTM状态
// BTMState btmState = 69;
TrainConnState connState = 69; //
}
message BTMState {
string telegram = 1;//16
bool aboveBalise = 2; //BTM天线即将经过应答器
string baliseTelegramForPcSimResend = 3; //pc仿真暂存应答器回复数据
string telegram128 = 4 ;//12816
string baliseId = 5;
bool isSend = 6;//
bool unpack =7; //
int32 baliseType = 8; // model的类型一致
bool hasData =9; //
uint32 resendCount = 10;//
uint32 packageDataSN = 11;//11线
}
//golang float类型数据序列化后丢失精度故使用string
// common_data TrainDynamicConfig类型属性保持一致
message TrainDynamicConfigMqtt{
//A float
string davisParamA = 1;
// B float
string davisParamB = 2;
// C float
string davisParamC = 3;
//线R1 float
string curveResistanceParamR1 = 4;
// 线R2 float
string curveResistanceParamR2 = 5;
// 线R3 float
string curveResistanceParamR3 = 6;
// 线R4 float
string curveResistanceParamR4 = 7;
// float
string revolvingMassParam = 8;
//
bool jump = 9;
//(m/s) 0 float
string slipA = 10;
// (m/s) 0
string slipR = 11;
// ms 0
int32 slipD = 12;
// m/s20 float
string idlingA = 14;
// m/s30
string idlingR = 15;
// ms0
int32 idlingD = 16;
///mm
int32 stopSign = 17;
// /m/s0 float
string slide = 18 ;
//
// int32 trainLoad = 19;
}
//
message TrainEndsStateMqtt{
//
bool speedSensorEnableA = 1;
bool speedSensorEnableB = 2;
//
bool radarEnable = 3;
/// float
string radarCheckSpeedDiff = 4;
//()
int32 radarCheckTime = 5;
bool accEnable = 6;
///
string accCheckSpeedDiff = 7;
//
int32 accCheckTime = 8;
// /
int32 accOutSpeed = 9;
// /
int32 radarOutSpeed = 10;
}
//
message ReplyState {
//
@ -725,8 +447,6 @@ message ReplyState {
bool xh = 2;
//
string code = 3;
//
bool force = 4;
}
//
@ -734,7 +454,6 @@ message ButtonState {
uint32 id = 1;
bool down = 2;
bool active = 3; //
// bool bypass = 4; //
}
//
@ -754,8 +473,6 @@ message PsdState {
uint32 id = 1; //id
repeated AsdState asdStates = 2; //
bool mgj = 3; //
request.PsdParam param = 4; //
bool zaw = 5; //
}
//
@ -764,16 +481,12 @@ message AsdState {
bool kmdw = 2; //
bool gmdw = 3; //
bool mgj = 4; //
bool zaw = 5; //
bool force = 6; ///
}
//
message KeyState {
uint32 id = 1;
int32 gear = 2;
// bool bypass = 3; //
}
//
@ -786,46 +499,7 @@ message MkxJState {
message BaliseState {
uint32 id = 1;
graphicData.KilometerSystem km = 2; //
string fixedTelegram = 3; //
string fixedUserTelegram = 4; //
string variableTelegram = 5; //
string variableUserTelegram = 6; //
bool work = 7; //
}
//
message StationQc {
repeated State qdStates = 1; //
repeated State cjStates = 2; //
message State {
int32 row = 1; //
int32 col = 2; //
bool on = 3; //
}
}
//
message CkmState {
uint32 id = 1; //id
bool mgj = 2; //
request.CkmParam param = 3; //
bool local = 4; ///
bool mplj = 5; //
}
//
message XcjState {
uint32 id = 1; //id
request.XcjParam param = 2; //
bool xqj = 3; //
repeated bool twjList = 4; //
bool tgqj = 5; //
bool xcjxj = 6; //
bool xcyxj = 7; //
repeated bool cfjList = 8; //
bool jtj = 9; //
bool tgyxj = 10; //
string telegram = 3; //16
}
////////////////////////////////////////////////////////////////////////////
@ -850,7 +524,7 @@ message AllDevicesStatus{
repeated TrainMapState trainState = 1;
//
repeated SwitchState switchState = 2;
//
//
repeated SectionState sectionState = 3;
//
repeated ReplyState replyState = 4;
@ -870,16 +544,6 @@ message AllDevicesStatus{
repeated PlatformState platformState = 11;
//
repeated BaliseState baliseState = 12;
//
StationQc stationQc = 13;
//
repeated CkmState ckmStates = 14;
//
repeated CkmState fymStates = 15;
//
repeated XcjState xcjStates = 16;
//
repeated AxleCountingSectionState axleCountingSection = 17;
}
//
@ -897,108 +561,15 @@ message PushedDevicesStatus{
message SimulationStatus {
enum SimulationState {
Init = 0;
Running = 1;
Pause = 2;
Error = 3;
Destroy = 4;
PAUSE = 0;
START = 1;
ERROR = 2;
DESTROY = 3;
}
string simulationId = 1;
SimulationState state = 2;
// string description = 3;
}
// 仿
message SimulationThirdPartyApiService {
enum Type {
//
Undefined = 0;
//
Dynamics = 1;
//
SemiPhysicalTrain = 2;
//pc仿真
Train_pc_sim = 3;
//
CI = 4;
//
AxleSection = 5;
string description = 3;
}
//
enum State {
//
Normal = 0;
//
Error = 1;
}
//
repeated SimulationThirdPartyApiServiceState states = 1;
}
// 仿
message SimulationThirdPartyApiServiceState {
//
SimulationThirdPartyApiService.Type type = 1;
//
SimulationThirdPartyApiService.State state = 2;
//
string serviceName = 3;
}
//
message TrainControlState{
map<string,ControlButton> buttons = 1;
repeated DriverKeySwitch driverKey = 2; //
map<string,SwitchKeyChange> switchKeyMap = 3;
// DirectionKeySwitch dirKey = 3; //
PushHandler pushHandler = 4; //
map<string, ControlLight> lightMaps = 5;
// int64 lineInitTimeStamp12PortA = 6; //12线
// int64 lineInitTimeStamp12PortB = 7; //12线
// bool line12ConnErrPortA = 8;//12线12线atp故障atp需要重启atp状态情况(atp故障时atp输出数字量返回的数据最后一个直接是0)
// bool line12ConnErrPortB = 9;//12线12线atp故障atp需要重启atp状态情况(atp故障时atp输出数字量返回的数据最后一个直接是0)
// bool TrainConnInitComplatePortA = 10;
// bool TrainConnInitComplatePortB = 11;
// bool activeTrainA = 12;
// bool activeTrainB = 13;
// bool Line12ConnErr = 14;
// int64 lineInitTimeStamp12 = 15;
message ControlButton{
uint32 id = 1;
bool passed = 3;
}
message DriverKeySwitch{
uint32 id = 1;
bool val = 2; //0=1=
// request.DriverType dt = 3;
}
message SwitchKeyChange{
uint32 id = 1;
uint32 val = 2; //0=(mm)1=(AA),2=(AM)
}
//
message PushHandler{
uint32 id = 1;
int32 val = 2; // 00 (*100)使100
}
message ControlLight{
uint32 id = 1;
bool val = 2;
}
}
//
message TrainControlStateMsg{
repeated TrainControlState.ControlButton buttons = 1;
repeated TrainControlState.DriverKeySwitch driverKey = 2; //
repeated TrainControlState.SwitchKeyChange switchKeys = 3; //
TrainControlState.PushHandler pushHandler = 4; //
repeated TrainControlState.ControlLight lights = 5;
}

View File

@ -13,6 +13,4 @@ enum PictureType {
IBP = 3;
/** 列车数据 */
TrainData = 4;
/** 列车驾驶台 */
TrainControlCab = 5;
}

View File

@ -39,8 +39,6 @@ message Relay {
string code = 2;//
//string model = 3;//
ModelType newModel = 4;//
string showCode = 5;//
CjDataItem.PostionType defaultInitialPosition = 6;//
}
/* 断相保护器 */
@ -66,7 +64,7 @@ message DeviceRelateRelay {
}
message Combinationtype {
string code = 1;
//repeated string oldrefRelays = 2;//
repeated string oldrefRelays = 2;//
repeated uint32 refRelays = 3;//
}
@ -95,9 +93,8 @@ message CjDataItem {
enum PostionType {
Q=0;
H=1;
NONE=2;
}
//string oldrelayId = 1;//Id
string oldrelayId = 1;//Id
PostionType position = 2;//QH对应着吸合
uint32 relayId = 3;//Id
}
@ -114,6 +111,6 @@ message QdDataSet {
}
message QdData {
//repeated string oldrefRelays=1;//Id
repeated string oldrefRelays=1;//Id
repeated uint32 refRelays=2;//Id
}

View File

@ -2,28 +2,6 @@ syntax = "proto3";
package request;
option go_package = "joylink.club/bj-rtsts-server/dto/request_proto";
/*
message BypassOperationReq{
enum Operation{
bypass = 0; //
bypass_reset = 1; //
}
enum BtnType{
esb_btn = 0;
ibp_btn = 1;
ibp_key = 2;
pls_btn = 3;
}
string simulationId = 1; // 仿id
int32 mapId = 2; // id
uint32 deviceId = 3; // id
string deviceCode = 5;//code
uint32 stationId = 6; //id
uint32 gateBoxId = 7;
BypassOperationReq.Operation operation = 8;
BypassOperationReq.BtnType btnType = 9;
}
*/
//
message Relay {
@ -45,33 +23,30 @@ message RelayOperationReq {
}
//
message Points {
message Turnout {
//
enum Operation {
Undefined = 0; //
SetParams = 1; //
}
//
enum Force {
FP_NONE = 0; //
FP_DW = 1; //
FP_FW = 2; //
FP_SB = 3; //
DC = 1; //
CancelDC = 2; //
FC = 3; //
CancelFC = 4; //
SetSB = 5; //
CancelSB = 6; //
SetJC = 7; //
CancelJC = 8; //
ForceDw = 9; //
ForceFw = 10; //
CancelForce = 11; //
}
}
//
message PointsOperationReq {
message TurnoutOperationReq {
string simulationId = 1; // 仿id
int32 mapId = 2; // id
uint32 deviceId = 3; // id
Points.Operation operation = 4; //
PointsParam param = 5; // ,operation为SetParams时有效
}
//
message PointsParam {
Points.Force forcePosition = 1; //
Turnout.Operation operation = 4; //
}
//
@ -79,95 +54,64 @@ message Signal {
//
enum Operation {
Undefined = 0; //
SetParams = 1; //
// Display = 1; //,绿
// LightHFaultDs = 2; //
// LightUFaultDs = 3; //
// LightLFaultDs = 4; //绿
// LightAFaultDs = 5; //
// LightBFaultDs = 6; //
// LightHCancelDs = 7; //
// LightUCancelDs = 8; //
// LightLCancelDs = 9; //绿
// LightACancelDs = 10; //
// LightBCancelDs = 11; //
Display = 1; //,绿
LightHFaultDs = 2; //
LightUFaultDs = 3; //
LightLFaultDs = 4; //绿
LightAFaultDs = 5; //
LightBFaultDs = 6; //
LightHCancelDs = 7; //
LightUCancelDs = 8; //
LightLCancelDs = 9; //绿
LightACancelDs = 10; //
LightBCancelDs = 11; //
}
enum DS {
DS_H = 0; //
DS_U = 1; //
DS_L = 2; // 绿
DS_A = 3; //
DS_B = 4; //
}
//
enum Force {
SF_NONE = 0; //
SF_M = 1; //
SF_H = 2; //
SF_U = 3; //
SF_L = 4; // 绿
SF_HU = 5; //
SF_A = 6; //
SF_B = 7; //
}
}
message SignalOperationReq {
string simulationId = 1; // 仿id
int32 mapId = 2; // id
uint32 deviceId = 3; // id
Signal.Operation operation = 4; //
SignalParam param = 5; // ,operation为SetParams时有效
}
message SignalParam {
Signal.Force force = 1; //
repeated Signal.DS dsList = 2; //
}
//
message Section {
//
enum Operation {
Undefined = 0; //
SetParams = 1; //
// SetDrst = 0;//
// CancelDrst = 1;//
// SetPdrst = 2;//
// CancelPdrst = 3;//
SetDrst = 0;//
CancelDrst = 1;//
SetPdrst = 2;//
CancelPdrst = 3;//
SetFaultOcc = 4; //
// CancelFaultOcc = 5; //
CancelFaultOcc = 5; //
}
}
message SectionOperationReq {
string simulationId = 1; // 仿id
int32 mapId = 2; // id
uint32 deviceId = 3; // id
Section.Operation operation = 4; //
SectionParam param = 5; // ,operation为SetParams时有效
}
message SectionParam {
// bool faultOcc = 1; //
bool mockDrst = 2; // CI计轴复位()
bool mockPdrst = 3; // CI计轴预复位()
}
//
message Psd {
enum Operation {
Undefined = 0;
SetParams = 1; //
}
enum Force {
F_NONE = 0; //
F_ASD_KM = 1; //
F_ASD_GM = 2; //
}
enum Fault {
FA_NONE = 0; //
FA_Obstacle = 1; //
//
// Km4 = 1; //
// CancelKm4 = 2; //
// Km8 = 3; //
// CancelKm8 = 4; //
// Gm = 5; //
// CancelGm = 6; //
// ForceKm4 = 7; //
// ForceKm8 = 8; //
// ForceGm = 9; //
Km = 1; //
CancelKm = 2; //
Gm = 3; //
CancelGm = 4; //
ForceKm = 5; //
ForceGm = 6; //
CancelForce = 10; //
//
AsdCannotOpen = 11; //
CancelAsdCannotOpen = 12; //
AsdCannotClose = 13; //
CancelAsdCannotClose = 14; //
//
QDTC = 15; //
CancelQDTC = 16; //
TZTC = 17; //
CancelTZTC = 18; //
}
}
@ -177,114 +121,6 @@ message PsdOperationReq {
int32 mapId = 2; // id
uint32 deviceId = 3; // id
Psd.Operation operation = 4; //
PsdParam param = 5; // ,operation为SetParams时有效
}
message PsdParam {
repeated int32 asdCodes = 1; //
Psd.Force force = 2; //
Psd.Fault fault = 3; //
}
//
message TrainControl{
string simulationId = 1; // 仿id
string trainId = 2;
uint32 deviceId = 3;//id
TrainControlType controlType = 4;
ControlButton controlButton = 5; //
DriverKeySwitch driverKey = 6;
SwitchKeyChange switchKey = 7; ///
PushHandler handler = 8; //
message ControlButton{
bool active = 1;
}
enum TrainControlType{
EMERGENT_BUTTON = 0; //
DRIVER_KEY_SWITCH = 1; //
DIRECTION_KEY_SWITCH = 2;//
HANDLER = 3; //
TRAIN_DOOR_MODE_CHANGE =4;//
}
enum KeyLocation{
KL_END = 0; //退 :mm模式
KL_FONT = 1; // :AA模式
KL_CENTER = 2;// :AM模式
}
//
message EmergentButton{
bool active = 1;
}
//
message DriverKeySwitch{
bool val = 1; //0=1=
}
message SwitchKeyChange{
uint32 val = 1; //0=(:MM)1=(:AA),2=(:AM)
}
//
message PushHandler{
int32 val = 1; // 00 (*100)使100
}
}
message CkmOperationReq {
string simulationId = 1;
int32 mapId = 2;
uint32 deviceId = 3; //idid
Ckm.Operation operation = 4; //
CkmParam param = 5; //operation为SetParams时有效
}
message Ckm {
enum Operation {
Undefined= 0;
SetParams = 1;
}
enum Force {
F_NONE = 0; //
F_KM = 1; //
F_GM = 2; //
}
enum Fault {
FA_NONE = 0; //
FA_State_Loss = 1; //
}
}
message CkmParam {
Ckm.Force force = 1;
Ckm.Fault fault = 2;
}
message XcjOperationReq {
string simulationId = 1;
int32 mapId = 2;
uint32 deviceId = 3; //idid
Xcj.Operation operation = 4;
XcjParam param = 5; //operation为SetParams时有效
}
message Xcj {
enum Operation {
Undefined= 0;
SetParams = 1;
}
enum Fault {
FA_NONE = 0; //
FA_Fault = 1; //
}
}
message XcjParam {
Xcj.Fault fault = 1;
repeated int32 asdCodes = 5; ///
int32 group = 6; //
}

View File

@ -1,8 +1,6 @@
syntax = "proto3";
package graphicData;
import "common_data.proto";
option java_package = "club.joylink.bjrtss.ats.verify.protos";
option java_outer_classname = "LayoutGraphicsProto";
option go_package = "joylink.club/bj-rtsts-server/dto/data_proto";
@ -27,7 +25,7 @@ message RtssGraphicStorage {
repeated LogicSection logicSections = 17;
repeated StopPosition stopPositions = 18;
repeated SpksSwitch spksSwitchs = 19;
repeated EsbButton esbButtons = 20; // ESB系统的象征物
repeated EsbButton esbButtons = 20; //
repeated GatedBox gateBoxs = 21; // //
repeated Transponder transponders = 22; //
repeated Slope slopes = 23; //
@ -38,7 +36,7 @@ message RtssGraphicStorage {
repeated TrackSection trackSections = 28; //
repeated TrackLogicSection trackLogicSections = 29; //
//UniqueIdType UniqueIdPrefix = 30;//--
UniqueIdOfStationLayout UniqueIdPrefix = 31;//
UniqueIdOfStationLayout UniqueIdPrefix = 31;//--
repeated KilometerConvert kilometerConvertList = 32;//
repeated ScreenDoor screenDoors = 33;
repeated StationRelateDevice stationRelateDeviceList = 34; //
@ -50,16 +48,6 @@ message RtssGraphicStorage {
repeated AutoReturnBox autoReturnBoxs = 40; //
repeated ConcentrationDividingLine concentrationDividingLines = 41; // 线
repeated OtherLine otherLineList = 42; // 线
repeated IbpBox ibpBoxs = 43; // ibp地图打开按钮
repeated PslBox pslBoxs = 44; // psl地图打开按钮
repeated CarWashing carWashings = 45; //
repeated GarageDoor garageDoors = 46; //
repeated GarageDoor floodGates = 47; //
//repeated GarageDoorBox garageDoorBoxes = 48; //Psl开启按钮
LianSuoData lianSuoData = 49; //
repeated HoldButton holdButtons = 50; //
repeated UnattengedButton unattengedButtons = 51; //
repeated KilometerMarkCalibration kilometerMarkCalibrations = 52; //
}
message Canvas {
@ -71,15 +59,6 @@ message Canvas {
string backgroundColor = 3;
//
Transform viewportTransform = 4;
//
Grid gridBackground = 5;
}
//
message Grid {
bool hasGrid = 1;
string lineColor = 2; // 线
int32 space = 3; //
}
message Point {
@ -110,7 +89,7 @@ message ChildTransform {
}
//
message CommonInfo {
// string oldid = 1;
string oldid = 1;
string graphicType = 2;
Transform transform = 3;
repeated ChildTransform childTransforms = 4;
@ -152,8 +131,8 @@ message ConcentrationDividingLine {
CommonInfo common = 1;
string code = 2; //
repeated Point points = 3; //
//string oldrefLeftStationId = 4;//id
//string oldrefRightStationId = 5;//id
string oldrefLeftStationId = 4;//id
string oldrefRightStationId = 5;//id
repeated NodeConWithSec nodeConWithSecs = 6;// 线
bool isOtherLineConcentrationDividingLine = 7;//线线
uint32 refLeftStationId = 8;//id
@ -179,8 +158,8 @@ message Platform {
//int32 refStationIndex = 6; //
// repeated string centralizedStations = 7; //
//repeated RelatedRef platformRef = 8; //
//string oldrefStationId = 9; //id
//string oldrefSectionId = 10; //id
string oldrefStationId = 9; //id
string oldrefSectionId = 10; //id
string refEsbRelayCode = 11;//
TypeOfPlatform type = 12; //
uint32 refStationId = 13; //id
@ -191,7 +170,7 @@ message ScreenDoor {
CommonInfo common = 1;
string code = 2;
//int32 sonDoorAmount = 3; //
//string oldrefPlatformId = 4; //
string oldrefPlatformId = 4; //
//repeated ScreenDoorGroup screenDoorGroupList = 5;//
uint32 refPlatformId = 6; //
}
@ -215,11 +194,11 @@ message Station {
// string kilometerCode = 5; //
KilometerSystem kilometerSystem = 6; //
// int32 index = 7;
//string refIbpMapCode = 8; // IBP地图Code
string refIbpMapCode = 8; // IBP地图Code
string stationName = 9; //
string stationNameAcronym = 10; //
bool depots = 11; //
//repeated string oldmanageStations = 12; // -id
repeated string oldmanageStations = 12; // -id
repeated uint32 manageStations = 13; // -id
}
@ -241,13 +220,13 @@ message AxleCounting {
// int32 index = 5; //
//bool invent = 6; //--
TypeDetectionPoint type = 7; //
//repeated string oldcentralizedStations = 8; // Id列表
repeated string oldcentralizedStations = 8; // Id列表
repeated uint32 centralizedStations = 9; // Id列表
}
message GenerateAxleCountingConfig {
//repeated string oldbbConnect = 1; //bb连接处生成计轴的道岔id()
//repeated string oldnoGenerateGroup = 2;//
repeated string oldbbConnect = 1; //bb连接处生成计轴的道岔id()
repeated string oldnoGenerateGroup = 2;//
repeated uint32 bbConnect = 3; //bb连接处生成计轴的道岔id()
repeated uint32 noGenerateGroup = 4;//
}
@ -281,11 +260,11 @@ message Turnout { //(后端不关注)
// KilometerSystem kilometerSystem = 12; //
repeated KilometerSystem kilometerSystem = 13; //
// int32 index = 14; //
//string oldpaTrackSectionId = 15; // A端轨道区段id
//string oldpbTrackSectionId = 16; // B端轨道区段id
//string oldpcTrackSectionId = 17; // C端轨道区段id
string oldpaTrackSectionId = 15; // A端轨道区段id
string oldpbTrackSectionId = 16; // B端轨道区段id
string oldpcTrackSectionId = 17; // C端轨道区段id
SwitchMachineType switchMachineType = 18; //
//repeated string oldcentralizedStations = 19; // Id列表
repeated string oldcentralizedStations = 19; // Id列表
repeated uint32 centralizedStations = 20; // Id列表
uint32 paTrackSectionId = 21; // A端轨道区段id
uint32 pbTrackSectionId = 22; // B端轨道区段id
@ -313,7 +292,7 @@ message Signal {
KilometerSystem kilometerSystem = 6;
// int32 index = 7; //
RelatedRef refDev = 8; ///
//repeated string oldcentralizedStations = 9; // Id列表
repeated string oldcentralizedStations = 9; // Id列表
//
//
//
@ -362,12 +341,12 @@ message Section {
RelatedRef paRef = 4; // A端关联的设备()()
RelatedRef pbRef = 5; // B端关联的设备()()
SectionType sectionType = 6; //
//repeated string oldaxleCountings = 7; //
repeated string oldaxleCountings = 7; //
// int32 index = 8; //
//string oldtrackSectionId = 9; // id
string oldtrackSectionId = 9; // id
bool isCurve = 10; // 线
int32 segmentsCount = 12; // 线
//repeated string oldcentralizedStations = 13; // Id列表
repeated string oldcentralizedStations = 13; // Id列表
RunningDirection normalRunningDirection = 14; //
bool isTurnBackZone = 15; //
Direction direction = 16; //
@ -379,10 +358,10 @@ message Section {
//
message RelatedRef {
enum DeviceType {
Section = 0; //
Turnout = 1; //
TrainWindow = 2; //
AxleCounting = 3; //
Section = 0;
Turnout = 1;
TrainWindow = 2;
AxleCounting = 3;
SectionLink = 4;
signal = 5;
station = 6;
@ -390,11 +369,6 @@ message RelatedRef {
SignalFaultAlarm = 8;
Breakers = 9;//
PowerScreen = 10;//
GarageDoor = 11; //
CarWashing = 12; //
FloodGate = 13; //
Platform = 14; //
LS = 15;//
}
enum DevicePort {
@ -404,14 +378,14 @@ message RelatedRef {
}
DeviceType deviceType = 1; //
//string oldid = 2; //ID
string oldid = 2; //ID
DevicePort devicePort = 3; //
uint32 id = 4;
}
//
message TurnoutPosRef {
//string oldid = 1; //ID
string oldid = 1; //ID
int32 position = 2; //01
uint32 id = 3;
}
@ -436,15 +410,10 @@ message Transponder { // 应答器
// int32 index = 4; //
KilometerSystem kilometerSystem = 5; //
RelatedRef TransponderRef = 6; //
//repeated string oldcentralizedStations = 7; // Id列表
// bytes fixedTelegram = 8;//
repeated string oldcentralizedStations = 7; // Id列表
bytes fixedTelegram = 8;//
TransponderTypeEnum type = 9;//
repeated uint32 centralizedStations = 10; // Id列表
string fixedTelegram = 11; //
string fixedUserTelegram = 12; //
string originalCode = 13; //
uint32 leuIndex = 14; //LEU的索引
uint32 leuInsideIndex = 15; // LEU内部的索引
}
message SimpleRef {
@ -453,7 +422,7 @@ message SimpleRef {
AxleCounting = 1;
}
DeviceType deviceType = 1;
//string oldid = 2;
string oldid = 2;
uint32 id = 3;
}
@ -487,9 +456,9 @@ message LogicSection { // 逻辑区段
CommonInfo common = 1;
string code = 2; //
repeated Point points = 3;
//string oldaxleSectionId = 4; // Id
string oldaxleSectionId = 4; // Id
// int32 index = 5; //
//string oldturnoutId = 6; // idC端关联的轨道link
string oldturnoutId = 6; // idC端关联的轨道link
uint32 axleSectionId = 7; // Id
uint32 turnoutId = 8; // idC端关联的轨道link
}
@ -505,7 +474,7 @@ message TrackSection { //轨道区段
// int32 index = 4; //
TrackSectionType type = 5; //
string destinationCode = 6; //
//repeated string oldtrackLogicSection = 7; //id()
repeated string oldtrackLogicSection = 7; //id()
// //id(/)(/)
bool isCurve = 8; // 线
int32 segmentsCount = 9; // 线
@ -540,9 +509,9 @@ message SpksSwitch {
bool flip = 3; //
// int32 index = 4; //
// int32 refStand = 5; //
//repeated string oldrefSections = 6; // id
//string oldrefStand = 7; //
// repeated uint32 refSections = 8; // id
repeated string oldrefSections = 6; // id
string oldrefStand = 7; //
repeated uint32 refSections = 8; // id
uint32 refStand = 9; //
}
@ -552,9 +521,8 @@ message EsbButton {
bool flip = 3; //
// int32 index = 4; //
// int32 refStand = 5; //
//string oldrefStand = 6; //
string oldrefStand = 6; //
uint32 refStand = 7; //
//string refEsbButtonMapCode = 8; // Code--PSL地图
}
message GatedBox {
@ -562,25 +530,11 @@ message GatedBox {
string code = 2;
bool flip = 3; //
// int32 index = 4; //
//string oldrefScreenDoor = 5; //
string oldrefScreenDoor = 5; //
string refGatedBoxMapCode = 6; // Code
uint32 refScreenDoor = 7; //
}
message IbpBox {
CommonInfo common = 1;
string code = 2;
string refIbpMapCode = 3; // Ibp地图Code
uint32 refStationId = 4; // id
}
message PslBox {
CommonInfo common = 1;
string code = 2;
string refPslMapCode = 3; // Psl地图Code
uint32 refPlatformId = 4; // id
}
/** 坡度公里标 */
message SlopeKiloMarker {
CommonInfo common = 1;
@ -594,23 +548,7 @@ message CurvatureKiloMarker {
string code = 2;
repeated KilometerSystem kilometerSystem = 4; //
}
/** 车库门 */
message GarageDoor {
CommonInfo common = 1;
string code = 2;
uint32 linkSection = 3; //
repeated uint32 centralizedStations = 4; // Id列表;
string refPslMapCode = 5; // Psl地图的code
}
/** 洗车机 */
message CarWashing {
CommonInfo common = 1;
string code = 2;
uint32 linkSection = 3; //
repeated uint32 centralizedStations = 4; // Id列表;
uint32 duanNum = 5; //
uint32 width = 6; //
}
/** 信标 */
message Beacon {
enum BeaconType {
@ -627,7 +565,7 @@ message Slope {
CommonInfo common = 1;
repeated Point points = 2;
sint32 slopeNumber = 3; //--
//repeated string oldrefDeviceId = 4; // ()
repeated string oldrefDeviceId = 4; // ()
repeated uint32 refDeviceId = 5; // ()
}
@ -635,7 +573,7 @@ message Curvature {
CommonInfo common = 1;
repeated Point points = 2;
sint32 curvatureNumber = 3; //线--
//repeated string oldrefDeviceId = 4; // 线()
repeated string oldrefDeviceId = 4; // 线()
repeated uint32 refDeviceId = 5; // 线()
}
@ -658,7 +596,7 @@ message Curvature {
message DepartureTimer {
CommonInfo common = 1;
string code = 2;
//string oldrefStand = 3; //
string oldrefStand = 3; //
string runDirection = 4; //
uint32 refStand = 5; //
}
@ -668,7 +606,7 @@ message AutoReturnBox {
string code = 2;
bool flip = 3; //
int32 index = 4; //
//string oldrefStand = 5; //
string oldrefStand = 5; //
uint32 refStand = 6; //
}
@ -693,13 +631,13 @@ message StationRelateDevice {
}
message DeviceCombinationtype {
string code = 1;
//repeated string oldrefDevices = 2;//
repeated string oldrefDevices = 2;//
repeated uint32 refDevices = 3;//
}
message SectionCodePoint {
//string oldCentralizedStation = 1; // id
//repeated string oldsectionIds = 2; //id列表
string oldCentralizedStation = 1; // id
repeated string oldsectionIds = 2; //id列表
repeated uint32 sectionIds = 3; //id列表
uint32 centralizedStation = 4; // id
}
@ -715,63 +653,14 @@ message Train {
TrainModel trainModel = 1; //
int32 carriageLength = 2; //
int32 totalLength = 3; //
// int32 minDiameter = 4; //
// int32 maxDiameter = 5; //
int32 minDiameter = 4; //
int32 maxDiameter = 5; //
string trainSets = 6; //
common.TrainDynamicConfig dynamicConfig = 7; //
// string trainControlMapCode = 8;
int32 trainControlMapId = 9;
int32 trainLoad = 10; //()
float trainMaxSpeed = 11; //(km/h)
float trainMaxAcc = 12; //(m/s^2)
float trainMaxBrake = 13; //(m/s^2)
float TrainEmergencyBrake = 14; //(m/s^2)
}
// 线
message OtherLine {
string name = 1;
//repeated string oldids = 2; // id列表
repeated string oldids = 2; // id列表
repeated uint32 ids = 3; // id列表
}
//
message LianSuoIndexData {
uint32 id = 1; // id
uint32 index = 2; //
}
//
message LianSuoData {
repeated LianSuoIndexData stations = 1;
repeated LianSuoIndexData switchs = 2;
repeated LianSuoIndexData screenDoors = 3;
repeated LianSuoIndexData signals = 4;
// repeated LianSuoIndexData sections = 5;
repeated LianSuoIndexData floodGates = 6;
repeated LianSuoIndexData spksSwitchs = 7;
repeated LianSuoIndexData garageDoors = 8;
repeated LianSuoIndexData carWashing = 9;
repeated LianSuoIndexData esbButtons = 10;
repeated LianSuoIndexData holdButtons = 11;
repeated LianSuoIndexData unattengedButtons = 12;
repeated LianSuoIndexData acSections = 13; //
}
//
message UnattengedButton {
CommonInfo common = 1;
string code = 2;
bool flip = 3; //
uint32 refStand = 4; //
}
//
message HoldButton {
CommonInfo common = 1;
string code = 2;
bool flip = 3; //
uint32 refStand = 4; // A联站台
}
//
message KilometerMarkCalibration {
KilometerSystem actualKm = 1;
KilometerSystem designKm =2;
}

View File

@ -1,63 +0,0 @@
syntax = "proto3";
import "stationLayoutGraphics.proto";
package tccGraphicData;
option go_package = "joylink.club/bj-rtsts-server/dto/data_proto";
message TccGraphicStorage {
graphicData.Canvas canvas = 1;
repeated TccButton tccButtons = 2;
repeated TccText tccTexts = 3;
repeated TccKey tccKeys = 4;
repeated TccHandle tccHandles = 5;
repeated TccLight tccLights = 6;
}
/** TCC按钮 */
message TccButton {
graphicData.CommonInfo common = 1;
string code = 2;
bool isSelfReset = 3;
}
/** TCC文字 */
message TccText {
graphicData.CommonInfo common = 1;
string code = 2;
string content = 3;
string color = 4;
int32 fontSize = 5;
}
/** TCC钥匙 */
message TccKey {
enum TccKeyType {
driverControllerActivationClint = 0; //
frontAndRearDirectionalControl = 1;//
trainDoorMode = 2;//
}
graphicData.CommonInfo common = 1;
string code = 2;
TccKeyType type = 3;
}
/** TCC手柄 */
message TccHandle {
graphicData.CommonInfo common = 1;
string code = 2;
}
/** TCC灯 */
message TccLight {
graphicData.CommonInfo common = 1;
string code = 2;
TccElementColor lightColor = 3;
bool activeLevel = 4;//
bool initialState = 5;//
}
enum TccElementColor {
green = 0;
red = 1;
blue = 2;
}