合并代码
This commit is contained in:
fan
commit
1649bf4b3f
@ -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;
|
||||
//限速类型
|
||||
// 为1时，CBTC限速；
|
||||
// 为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;
|
||||
}
|
||||
@ -7,20 +7,18 @@ message LineNetTrainOffset{
|
||||
//线路id
|
||||
int32 lineId = 1;
|
||||
//车组号
|
||||
string Group_id = 2;
|
||||
string groupId = 2;
|
||||
//方向
|
||||
int32 dir = 3;
|
||||
// true-到达，false-出发
|
||||
bool initType = 4;
|
||||
//位置
|
||||
int32 offset = 5;
|
||||
//目的地id
|
||||
int32 destinationId = 6;
|
||||
//后方车站
|
||||
int32 backId = 7;
|
||||
//是否删除
|
||||
bool show = 8;
|
||||
//完成率
|
||||
float rate = 9;
|
||||
//是否显示
|
||||
bool show = 4;
|
||||
//车次窗编号
|
||||
int32 windowNo = 5;
|
||||
//车次窗位置
|
||||
int32 windowOffset = 6;
|
||||
//目的地
|
||||
string destinationId = 7;
|
||||
//后部车站
|
||||
string backId = 8;
|
||||
}
|
||||
|
||||
|
||||
@ -108,6 +108,8 @@ message Switch{
|
||||
bool ipSingleSwitchStusLostIndication = 27;
|
||||
//设备唯一识别码，一般为设备名称
|
||||
string id = 28;
|
||||
//限速值KM/H
|
||||
int32 speedLimit = 29;
|
||||
}
|
||||
|
||||
message Track{
|
||||
@ -124,6 +126,21 @@ message Track{
|
||||
bool blocked = 11;
|
||||
//设备唯一识别码，一般为设备名称
|
||||
string id = 12;
|
||||
//限速
|
||||
int32 speedLimit = 13;
|
||||
//限速类型
|
||||
LimitType limitType = 14;
|
||||
|
||||
//track限速类型
|
||||
enum LimitType{
|
||||
Unknown = 0;
|
||||
//为1时，CBTC限速
|
||||
Cbtc = 1;
|
||||
//为2时，联锁限速；
|
||||
Interlock = 2;
|
||||
//为4时，同时限速。
|
||||
CbtcInterlock = 4;
|
||||
}
|
||||
}
|
||||
|
||||
message Platform{
|
||||
@ -142,6 +159,12 @@ message Platform{
|
||||
bool downTrainSkipstop = 13;
|
||||
//设备唯一识别码，一般为设备名称
|
||||
string id = 14;
|
||||
//下一区间运行时间
|
||||
int32 nextSectionRunTime = 15;
|
||||
//下一区间运行等级
|
||||
int32 nextSectionRunLevel = 16;
|
||||
//停站时间
|
||||
int32 stopTime = 17;
|
||||
}
|
||||
|
||||
message Scada{
|
||||
@ -212,3 +235,16 @@ message TrainMode{
|
||||
//设备唯一识别码，一般为设备名称
|
||||
string id = 35;
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
||||
//2.7.2 信息源网络状态消息
|
||||
//NCC FEP与OCC FEP 间的网络连接状态
|
||||
message OccNccFepNetwork{
|
||||
//当前线路号
|
||||
string id = 1;
|
||||
//true 代表与当前线路号的信息源(server)连接正常
|
||||
//false 代表断开
|
||||
bool active = 2;
|
||||
}
|
||||
|
||||
|
||||
@ -10,11 +10,14 @@ message RtssGraphicStorage {
|
||||
repeated IscsFan iscsFans = 3;
|
||||
repeated Platform Platforms = 4;
|
||||
repeated Station stations = 5;
|
||||
repeated Rect Rects = 6;
|
||||
repeated Rect rects = 6;
|
||||
repeated Train train = 7;
|
||||
repeated Signal signals = 8;
|
||||
repeated Turnout turnouts = 9;
|
||||
repeated RunLine runLines = 10;
|
||||
repeated Section section = 10;
|
||||
repeated StationLine stationLines = 11;
|
||||
repeated RunLine runLines = 12;
|
||||
|
||||
}
|
||||
|
||||
message Canvas {
|
||||
@ -77,10 +80,10 @@ message Rect {
|
||||
string code = 2;
|
||||
int32 lineWidth = 3; // 线宽
|
||||
string lineColor = 4; // 线色
|
||||
Point point = 5; // 位置坐标
|
||||
float width = 6; //宽度
|
||||
float height = 7; //高度
|
||||
repeated Point points = 8; // 点坐标列表
|
||||
float width = 5; //宽度
|
||||
float height = 6; //高度
|
||||
int32 radius = 7; //圆角半径
|
||||
Point point = 8; // 画第一个点的坐标
|
||||
}
|
||||
|
||||
message Platform {
|
||||
@ -95,6 +98,12 @@ message Station {
|
||||
string code = 2;
|
||||
}
|
||||
|
||||
message StationLine {
|
||||
CommonInfo common = 1;
|
||||
string code = 2;
|
||||
bool hasTransfer = 3; // 是否有换乘图标
|
||||
}
|
||||
|
||||
message Train {
|
||||
CommonInfo common = 1;
|
||||
string code = 2;
|
||||
@ -126,5 +135,10 @@ message RunLine {
|
||||
string code = 2;
|
||||
repeated Point points = 3;
|
||||
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
50
protos/trans.proto
Normal 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;
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user