Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
f566f96c40
@ -148,8 +148,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
|
||||
@ -175,8 +175,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
|
||||
@ -187,7 +187,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,7 +215,7 @@ message Station {
|
||||
string stationName = 9; //车站名
|
||||
string stationNameAcronym = 10; // 车站名拼音简写
|
||||
bool depots = 11; //是否车辆段
|
||||
repeated string oldmanageStations = 12; // 如果是集中站——管理的车站-id
|
||||
//repeated string oldmanageStations = 12; // 如果是集中站——管理的车站-id
|
||||
repeated uint32 manageStations = 13; // 如果是集中站——管理的车站-id
|
||||
}
|
||||
|
||||
@ -237,13 +237,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;//指定的道岔组不生成计轴
|
||||
}
|
||||
@ -277,11 +277,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
|
||||
@ -309,7 +309,7 @@ message Signal {
|
||||
KilometerSystem kilometerSystem = 6;
|
||||
// int32 index = 7; //索引
|
||||
RelatedRef refDev = 8; //关联设备(区段/道岔)
|
||||
repeated string oldcentralizedStations = 9; // 集中站Id列表
|
||||
//repeated string oldcentralizedStations = 9; // 集中站Id列表
|
||||
// 信号机模型类型枚举
|
||||
// 从左向右,最左边为靠近灯座的灯
|
||||
// 如果没有说明,默认不封灯,无引导
|
||||
@ -358,12 +358,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; // 上下行
|
||||
@ -397,14 +397,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; //道岔的正反为,0是定位,1是反位
|
||||
uint32 id = 3;
|
||||
}
|
||||
@ -429,7 +429,7 @@ message Transponder { // 应答器
|
||||
// int32 index = 4; // 索引编号
|
||||
KilometerSystem kilometerSystem = 5; //公里标
|
||||
RelatedRef TransponderRef = 6; //关联关系
|
||||
repeated string oldcentralizedStations = 7; // 集中站Id列表
|
||||
//repeated string oldcentralizedStations = 7; // 集中站Id列表
|
||||
// bytes fixedTelegram = 8;//无源应答器固定报文
|
||||
TransponderTypeEnum type = 9;//应答器类型
|
||||
repeated uint32 centralizedStations = 10; // 集中站Id列表
|
||||
@ -444,7 +444,7 @@ message SimpleRef {
|
||||
AxleCounting = 1;
|
||||
}
|
||||
DeviceType deviceType = 1;
|
||||
string oldid = 2;
|
||||
//string oldid = 2;
|
||||
uint32 id = 3;
|
||||
}
|
||||
|
||||
@ -478,9 +478,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; // 关联的岔芯对应的道岔id,此时该逻辑区段为该道岔C端关联的轨道link
|
||||
//string oldturnoutId = 6; // 关联的岔芯对应的道岔id,此时该逻辑区段为该道岔C端关联的轨道link
|
||||
uint32 axleSectionId = 7; // 关联的计轴区段Id
|
||||
uint32 turnoutId = 8; // 关联的岔芯对应的道岔id,此时该逻辑区段为该道岔C端关联的轨道link
|
||||
}
|
||||
@ -496,7 +496,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; // 曲线分段数
|
||||
@ -531,8 +531,8 @@ message SpksSwitch {
|
||||
bool flip = 3; // 是否翻转(前端显示)
|
||||
// int32 index = 4; //索引
|
||||
// int32 refStand = 5; //关联站台索引
|
||||
repeated string oldrefSections = 6; // 关联物理区段id
|
||||
string oldrefStand = 7; // 关联站台
|
||||
//repeated string oldrefSections = 6; // 关联物理区段id
|
||||
//string oldrefStand = 7; // 关联站台
|
||||
repeated uint32 refSections = 8; // 关联物理区段id
|
||||
uint32 refStand = 9; // 关联站台
|
||||
}
|
||||
@ -543,7 +543,7 @@ 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地图
|
||||
}
|
||||
@ -553,7 +553,7 @@ message GatedBox {
|
||||
string code = 2;
|
||||
bool flip = 3; // 是否翻转(前端显示)
|
||||
// int32 index = 4; //索引
|
||||
string oldrefScreenDoor = 5; // 关联屏蔽门
|
||||
//string oldrefScreenDoor = 5; // 关联屏蔽门
|
||||
string refGatedBoxMapCode = 6; // 关联门控箱地图Code
|
||||
uint32 refScreenDoor = 7; // 关联屏蔽门
|
||||
}
|
||||
@ -616,7 +616,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; // 坡度关联的(坡度公里标)
|
||||
}
|
||||
|
||||
@ -624,7 +624,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; // 曲线关联的(曲度公里标)
|
||||
}
|
||||
|
||||
@ -647,7 +647,7 @@ message Curvature {
|
||||
message DepartureTimer {
|
||||
CommonInfo common = 1;
|
||||
string code = 2;
|
||||
string oldrefStand = 3; // 关联站台
|
||||
//string oldrefStand = 3; // 关联站台
|
||||
string runDirection = 4; //运行方向
|
||||
uint32 refStand = 5; // 关联站台
|
||||
}
|
||||
@ -657,7 +657,7 @@ message AutoReturnBox {
|
||||
string code = 2;
|
||||
bool flip = 3; // 是否翻转(前端显示)
|
||||
int32 index = 4; //索引
|
||||
string oldrefStand = 5; // 关联站台
|
||||
//string oldrefStand = 5; // 关联站台
|
||||
uint32 refStand = 6; // 关联站台
|
||||
}
|
||||
|
||||
@ -682,13 +682,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,6 +715,6 @@ message Train {
|
||||
// 其他线
|
||||
message OtherLine {
|
||||
string name = 1;
|
||||
repeated string oldids = 2; // 设备id列表
|
||||
//repeated string oldids = 2; // 设备id列表
|
||||
repeated uint32 ids = 3; // 设备id列表
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user