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

protos/alertConst.proto

@@ -0,0 +1,39 @@
+syntax = "proto3";
+
+package alert;
+
+
+//模型的可变的状态数据
+//import "LineNetTrainOffsetDiagram.proto";
+option java_package = "club.joylink.xiannccda.dto.protos";
+option java_outer_classname = "AlertConstProto";
+
+enum AlertLocation {
+  ALERT_LOCATION_UNKNOWN = 0;
+  //全线
+  QX = 1;
+  //鱼化寨联锁区
+  YHZ_LSQ = 2;
+  //胡家庙联锁区
+  HJM_LSQ = 3;
+  //北池头联锁区
+  BCT_LSQ = 4;
+  //保税区联锁区
+  BSQ_LSQ = 5;
+}
+
+enum AlertType {
+  ALERT_TYPE_UNKNOWN = 0;
+  //蓝显
+  BLUE_DISPLAY = 1;
+  //列车延误2分钟
+  TRAIN_DELAY_2 = 2;
+  //列车延误10分钟
+  TRAIN_DELAY_10 = 3;
+  //整侧站台门无关闭锁紧信号
+  PLATFORM_DOOR_WITHOUT_LOCKED_SIGNAL = 4;
+  //整侧站台门无法打开
+  PLATFORM_DOOR_CANNOT_OPEN = 5;
+  //整侧站台门无法关闭
+  PLATFORM_DOOR_CANNOT_CLOSE = 6;
+}

protos/alertInfo.proto

@@ -2,6 +2,7 @@ syntax = "proto3";
 
 package alert;
 
+import "alertConst.proto";
 
 //模型的可变的状态数据
 //import "LineNetTrainOffsetDiagram.proto";
@@ -16,17 +17,18 @@ message NccAlertInfoMessage {
 
     string alert_time = 3;
 
-    string info = 4;
+    int32 alert_tip_id = 4;
 
-    int32 alert_tip_id = 5;
+    int32 line_id = 5;
 
-    //故障设备信息
-    string device_info = 6;
+    string alert_object = 6;
 
-    //导致报警的原因
-    string reason = 7;
+    AlertType alert_type = 7;
+
+    string locator_device_id = 8;
+
+    bool mock = 9;
   }
+
   repeated Message messages = 1;
-
-
 }

protos/device_info.proto

@@ -15,17 +15,14 @@ message Section {
   // 关联区段
   repeated string childrenId = 3;
 
-  // 公里标
-  repeated graphicData.KilometerSystem kilometerSystem = 4;
-
-  // 转换后的公里标数字
-  repeated int64 convertKilometer = 5;
-  
   // 物理区段Id
-  string physicalSectionId = 6;
-  
+  string physicalSectionId = 4;
+
   // 目的地码
-  string destinationCode = 7;
+  string destinationCode = 5;
+
+  // 公里标信息
+  DeviceKilometer kilometer = 6;
 }
 
 // 道岔
@@ -35,10 +32,16 @@ message Turnout {
 
   string code = 2;
 
-  // 关联道岔的公里标
-  repeated graphicData.KilometerSystem kilometerSystem = 3;
-
-  // 转换后的公里标数字
-  repeated int64 convertKilometer = 4;
+  // 公里标信息
+  DeviceKilometer kilometer = 3;
 }
 
+// 公共属性
+message DeviceKilometer {
+
+  int64 minKilometer = 1;
+
+  int64 maxKilometer = 2;
+
+  repeated graphicData.KilometerSystem kilometerSystem = 3;
+}

protos/stationLayoutGraphics.proto

@@ -105,8 +105,9 @@ message Platform {
   string code = 2;
   bool hasdoor = 3;     // 是否有屏蔽门
   string direction = 4; // 行驶方向--屏蔽门上下
-  string upAndDown =5; //上下行--upLink表示上行，downLink表示下行
+  //string upAndDown =5; //上下行--upLink表示上行，downLink表示下行
   string refStation=6; //关联的车站
+  bool up = 7;//上下行--true表示上行，false表示下行
 }
 
 message Station {