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

protos/alertInfo.proto

@@ -0,0 +1,32 @@
+syntax = "proto3";
+
+package alert;
+
+
+//模型的可变的状态数据
+//import "LineNetTrainOffsetDiagram.proto";
+option java_package = "club.joylink.xiannccda.dto.protos";
+option java_outer_classname = "NccAlertInfoMessageProto";
+
+message NccAlertInfoMessage {
+  message Message {
+    string id = 1;
+
+    string level = 2;
+
+    string alert_time = 3;
+
+    string info = 4;
+
+    int32 alert_tip_id = 5;
+
+    //故障设备信息
+    string device_info = 6;
+
+    //导致报警的原因
+    string reason = 7;
+  }
+  repeated Message messages = 1;
+
+
+}

protos/device_status.proto

@@ -16,7 +16,6 @@ enum DeviceType{
   WATERPROOF_DOOR = 11;
   WORK_AREA = 12;
   GAMA = 13;
-
 }
 
 message Rtu {
@@ -94,33 +93,33 @@ message Entry{
 }
 
 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;
+  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
@@ -262,6 +261,3 @@ message OccNccFepNetwork{
   // false 代表断开
   bool active = 2;
 }
-
-
-

protos/stationLayoutGraphics.proto

@@ -23,6 +23,7 @@ message RtssGraphicStorage {
   repeated TrainWindow trainWindows = 16;
   repeated AxleCounting axleCountings = 17;
   repeated Separator separators = 18;
+  repeated LogicSection logicSections = 19;
 }
 
 message Canvas {
@@ -125,7 +126,7 @@ message StationLine {
 message TrainWindow {
   CommonInfo common = 1;
   string code = 2;
-  string sectionId = 3;
+  repeated string refDeviceId = 3; //关联的逻辑区段的id或由道岔区段生成所关联的道岔id
 }
 
 message AxleCounting {
@@ -190,20 +191,29 @@ message RunLine {
   string lineId = 10;
 }
 
+/** 物理区段 */
 message Section {
   enum SectionType {
-    Physical = 0;
-    Logic = 1;
-    TurnoutPhysical = 2;
+    Physical = 0;        //物理区段
+    TurnoutPhysical = 2; //道岔物理区段
   }
 
   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; // 关联的计轴(岔区&&非岔区)
+  repeated string children = 8; // 下属逻辑区段id(非岔区)/下属道岔id(岔区)
+  string destinationCode = 9; // 目的地码
+}
+
+/** 逻辑区段 */
+message LogicSection {
+  CommonInfo common = 1;
+  string code = 2;
+  repeated Point points = 3;
 }
 
 message KilometerPoint {
@@ -216,8 +226,9 @@ message PathLine {
   CommonInfo common = 1;
   string code = 2;
   repeated Point points = 3;
-  bool isUp = 4;
-  repeated KilometerPoint kilometerPoints = 5;
+  bool isUp = 4;                               // 是否上行
+  repeated KilometerPoint kilometerPoints = 5; // 车站对应的公里标以及坐标点
+  bool isKmIncrease = 6; // 运行方向是否公里标递增
 }
 
 //关联设备

protos/train.proto

@@ -25,7 +25,7 @@ message TrainInfo {
   // 列车车次号
   string globalId = 9;
   // 目的地ID
-  int32 destinationId = 10;
+  string destinationId = 10;
   // 编组数量
   int32 rollingStock = 11;
   // 司机号