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

protos/device_status.proto

@@ -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;
@@ -16,10 +16,9 @@ enum DeviceType{
   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{
+message Switch {
-  bool ipSingleSwitchStusCiOccupied = 1;
+  bool ipSingleSwitchStusCiOccupied = 1;      // 连锁报告道岔占用
-  bool ipSingleSwitchStusCbtcOccupied = 2;
+  bool ipSingleSwitchStusCbtcOccupied = 2;    // CBTC报告道岔占用
-  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;     // 道岔区段被ATC报告失效
-  bool ipSingleSwitchStusOverlap = 19;
+  bool ipSingleSwitchStusOverlap = 19;        // OVERLAP
-  bool ipSingleSwitchStusTsrCbtcMain = 20;
+  bool ipSingleSwitchStusTsrCbtcMain = 20;    // CBTC岔前限速
-  bool ipSingleSwitchStusTsrCbtcNormal = 21;
+  bool ipSingleSwitchStusTsrCbtcNormal = 21;  // CBTC定位限速
-  bool ipSingleSwitchStusTsrCbtcReverse = 22;
+  bool ipSingleSwitchStusTsrCbtcReverse = 22; // CBTC反位限速
-  bool ipSingleSwitchStusTsrBmMain = 23;
+  bool ipSingleSwitchStusTsrBmMain = 23;      // BM岔前限速
-  bool ipSingleSwitchStusTsrBmNormal = 24;
+  bool ipSingleSwitchStusTsrBmNormal = 24;    // BM定位限速
-  bool ipSingleSwitchStusTsrBmReverse = 25;
+  bool ipSingleSwitchStusTsrBmReverse = 25;   // BM反位限速
-  bool ipSingleSwitchStusBlocked2 = 26;
+  bool ipSingleSwitchStusBlocked2 = 26;       // 道岔封锁
-  bool ipSingleSwitchStusLostIndication = 27;
+  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限速类型
+  // track限速类型
-  enum LimitType{
+  enum LimitType {
     Unknown = 0;
     //为1时，CBTC限速
     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	信息源网络状态消息
+// 2.7.2	信息源网络状态消息
-//NCC FEP与OCC FEP 间的网络连接状态
+// NCC FEP与OCC FEP 间的网络连接状态
-message OccNccFepNetwork{
+message OccNccFepNetwork {
   //当前线路号
   string id = 1;
-  //true 代表与当前线路号的信息源(server)连接正常
+  // true 代表与当前线路号的信息源(server)连接正常
-  //false 代表断开
+  // false 代表断开
-  bool  active = 2;
+  bool active = 2;
 }
-
-
-