joylink/rts-sim-testing-message
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

去掉new

Browse Source
This commit is contained in:
joylink_zhaoerwei 2023-12-13 14:35:39 +08:00
parent 4c962bc7b0
commit dac1dc8116
2 changed files with 76 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
protos/relayCabinetLayoutGraphics.proto
View File

@ -64,8 +64,8 @@ message DeviceRelateRelay {
}
message Combinationtype {
string code = 1;
repeated string refRelays = 2;//设备关联的继电器
repeated uint32 newrefRelays = 3;//设备关联的继电器
repeated string oldrefRelays = 2;//设备关联的继电器
repeated uint32 refRelays = 3;//设备关联的继电器
}
message UniqueIdType {
@ -94,9 +94,9 @@ message CjDataItem {
Q=0;
H=1;
}
string relayId = 1;//采集对应的继电器Id
string oldrelayId = 1;//采集对应的继电器Id
PostionType position = 2;//继电器的位置，QH对应着吸合
uint32 newrelayId = 3;//采集对应的继电器Id
uint32 relayId = 3;//采集对应的继电器Id
}
/* 驱动 */
@ -111,6 +111,6 @@ message QdDataSet {
}
message QdData {
repeated string refRelays=1;//驱动的继电器Id
repeated uint32 newrefRelays=2;//驱动的继电器Id
repeated string oldrefRelays=1;//驱动的继电器Id
repeated uint32 refRelays=2;//驱动的继电器Id
}

140
protos/stationLayoutGraphics.proto
View File

@ -89,11 +89,11 @@ message ChildTransform {
}
// 公共属性
message CommonInfo {
string id = 1;
string oldid = 1;
string graphicType = 2;
Transform transform = 3;
repeated ChildTransform childTransforms = 4;
uint32 newId = 5;
uint32 id = 5;
}
// message Link {
@ -131,12 +131,12 @@ message ConcentrationDividingLine {
CommonInfo common = 1;
string code = 2; // 编号
repeated Point points = 3; // 点列表
string refLeftStationId = 4;//左边关联的集中站id
string refRightStationId = 5;//右边关联的集中站id
string oldrefLeftStationId = 4;//左边关联的集中站id
string oldrefRightStationId = 5;//右边关联的集中站id
repeated NodeConWithSec nodeConWithSecs = 6;// 集中区分割线与区段的交点
bool isOtherLineConcentrationDividingLine = 7;//集中区分割线绘制在其它线的边界处
uint32 newrefLeftStationId = 8;//左边关联的集中站id
uint32 newrefRightStationId = 9;//右边关联的集中站id
uint32 refLeftStationId = 8;//左边关联的集中站id
uint32 refRightStationId = 9;//右边关联的集中站id
}
message NodeConWithSec {
@ -158,21 +158,21 @@ message Platform {
//int32 refStationIndex = 6; //关联车站索引
// repeated string centralizedStations = 7; // 集中站列表
//repeated RelatedRef platformRef = 8; //站台关联的车站和物理区段
string refStationId = 9; //关联的车站的id
string refSectionId = 10; //关联的物理区段id
string oldrefStationId = 9; //关联的车站的id
string oldrefSectionId = 10; //关联的物理区段id
string refEsbRelayCode = 11;//关联的紧急停车继电器的编号
TypeOfPlatform type = 12; //站台的上下行
uint32 newrefStationId = 13; //关联的车站的id
uint32 newrefSectionId = 14; //关联的物理区段id
uint32 refStationId = 13; //关联的车站的id
uint32 refSectionId = 14; //关联的物理区段id
}
message ScreenDoor {
CommonInfo common = 1;
string code = 2;
//int32 sonDoorAmount = 3; //子屏蔽门的数量
string refPlatformId = 4; //关联的站台
string oldrefPlatformId = 4; //关联的站台
//repeated ScreenDoorGroup screenDoorGroupList = 5;//编组列表
uint32 newRefPlatformId = 6; //关联的站台
uint32 refPlatformId = 6; //关联的站台
}
message ScreenDoorConfig {
@ -198,8 +198,8 @@ message Station {
string stationName = 9; //车站名
//string stationNameAcronym = 10; // 车站名缩写
bool depots = 11; //是否车辆段
repeated string manageStations = 12; // 如果是集中站——管理的车站-id
repeated uint32 newmanageStations = 13; // 如果是集中站——管理的车站-id
repeated string oldmanageStations = 12; // 如果是集中站——管理的车站-id
repeated uint32 manageStations = 13; // 如果是集中站——管理的车站-id
}
message TrainWindow {
@ -220,15 +220,15 @@ message AxleCounting {
// int32 index = 5; //计轴的索引编号
//bool invent = 6; //是否虚拟计轴--一般是最末端
TypeDetectionPoint type = 7; //检测点的类型：计轴、区段边界
repeated string centralizedStations = 8; // 集中站Id列表
repeated uint32 newcentralizedStations = 9; // 集中站Id列表
repeated string oldcentralizedStations = 8; // 集中站Id列表
repeated uint32 centralizedStations = 9; // 集中站Id列表
}
message GenerateAxleCountingConfig {
repeated string bbConnect = 1; //需要在道岔bb连接处生成计轴的道岔id(填一个就行)
repeated string noGenerateGroup = 2;//指定的道岔组不生成计轴
repeated uint32 newbbConnect = 3; //需要在道岔bb连接处生成计轴的道岔id(填一个就行)
repeated uint32 newnoGenerateGroup = 4;//指定的道岔组不生成计轴
repeated string oldbbConnect = 1; //需要在道岔bb连接处生成计轴的道岔id(填一个就行)
repeated string oldnoGenerateGroup = 2;//指定的道岔组不生成计轴
repeated uint32 bbConnect = 3; //需要在道岔bb连接处生成计轴的道岔id(填一个就行)
repeated uint32 noGenerateGroup = 4;//指定的道岔组不生成计轴
}
// message Train {
@ -260,15 +260,15 @@ message Turnout { //(后端不关注)
// KilometerSystem kilometerSystem = 12; // 道岔公里标
repeated KilometerSystem kilometerSystem = 13; // 道岔公里标
// int32 index = 14; //索引
string paTrackSectionId = 15; // A端轨道区段id
string pbTrackSectionId = 16; // B端轨道区段id
string pcTrackSectionId = 17; // C端轨道区段id
string oldpaTrackSectionId = 15; // A端轨道区段id
string oldpbTrackSectionId = 16; // B端轨道区段id
string oldpcTrackSectionId = 17; // C端轨道区段id
SwitchMachineType switchMachineType = 18; // 转辙机类型
repeated string centralizedStations = 19; // 集中站Id列表
repeated uint32 newcentralizedStations = 20; // 集中站Id列表
uint32 newpaTrackSectionId = 21; // A端轨道区段id
uint32 newpbTrackSectionId = 22; // B端轨道区段id
uint32 newpcTrackSectionId = 23; // C端轨道区段id
repeated string oldcentralizedStations = 19; // 集中站Id列表
repeated uint32 centralizedStations = 20; // 集中站Id列表
uint32 paTrackSectionId = 21; // A端轨道区段id
uint32 pbTrackSectionId = 22; // B端轨道区段id
uint32 pcTrackSectionId = 23; // C端轨道区段id
}
@ -292,7 +292,7 @@ message Signal {
KilometerSystem kilometerSystem = 6;
// int32 index = 7; //索引
RelatedRef refDev = 8; //关联设备（区段/道岔）
repeated string centralizedStations = 9; // 集中站Id列表
repeated string oldcentralizedStations = 9; // 集中站Id列表
// 信号机模型类型枚举
// 从左向右，最左边为靠近灯座的灯
// 如果没有说明，默认不封灯，无引导
@ -312,7 +312,7 @@ message Signal {
Model mt = 10;
//string belongStation = 11; // 所属车站(缩写)
Direction direction = 12; // 上下行
repeated uint32 newcentralizedStations = 13; // 集中站Id列表
repeated uint32 centralizedStations = 13; // 集中站Id列表
}
/** 上下行（区段/信号机） */
@ -341,18 +341,18 @@ message Section {
RelatedRef paRef = 4; // 区段A端关联的设备(非岔区)(后端不关注)
RelatedRef pbRef = 5; // 区段B端关联的设备(非岔区)(后端不关注)
SectionType sectionType = 6; // 区段类型
repeated string axleCountings = 7; // 区段对应的计轴
repeated string oldaxleCountings = 7; // 区段对应的计轴
// int32 index = 8; // 索引
string trackSectionId = 9; // 下属轨道区段id
string oldtrackSectionId = 9; // 下属轨道区段id
bool isCurve = 10; // 是否曲线
int32 segmentsCount = 12; // 曲线分段数
repeated string centralizedStations = 13; // 集中站Id列表
repeated string oldcentralizedStations = 13; // 集中站Id列表
RunningDirection normalRunningDirection = 14; //常规运行方向
bool isTurnBackZone = 15; // 是否为折返区域
Direction direction = 16; // 上下行
repeated uint32 newaxleCountings = 17; // 区段对应的计轴
uint32 newtrackSectionId = 18; // 下属轨道区段id
repeated uint32 newcentralizedStations = 19; // 集中站Id列表
repeated uint32 axleCountings = 17; // 区段对应的计轴
uint32 trackSectionId = 18; // 下属轨道区段id
repeated uint32 centralizedStations = 19; // 集中站Id列表
}
//关联设备
@ -378,9 +378,9 @@ message RelatedRef {
}
DeviceType deviceType = 1; //关联的设备类型
string id = 2; //关联的设备ID
string oldid = 2; //关联的设备ID
DevicePort devicePort = 3; //关联的设备端口
uint32 newid = 4;
uint32 id = 4;
}
//计轴区段与道岔的位置关系
@ -409,10 +409,10 @@ message Transponder { // 应答器
// int32 index = 4; // 索引编号
KilometerSystem kilometerSystem = 5; //公里标
RelatedRef TransponderRef = 6; //关联关系
repeated string centralizedStations = 7; // 集中站Id列表
repeated string oldcentralizedStations = 7; // 集中站Id列表
bytes fixedTelegram = 8;//无源应答器固定报文
TransponderTypeEnum type = 9;//应答器类型
repeated uint32 newcentralizedStations = 10; // 集中站Id列表
repeated uint32 centralizedStations = 10; // 集中站Id列表
}
message SimpleRef {
@ -421,8 +421,8 @@ message SimpleRef {
AxleCounting = 1;
}
DeviceType deviceType = 1;
string id = 2;
uint32 newid = 3;
string oldid = 2;
uint32 id = 3;
}
message SectionLink {
@ -455,11 +455,11 @@ message LogicSection { // 逻辑区段
CommonInfo common = 1;
string code = 2; // 名称
repeated Point points = 3;
string axleSectionId = 4; // 关联的计轴区段Id
string oldaxleSectionId = 4; // 关联的计轴区段Id
// int32 index = 5; // 索引编号
string turnoutId = 6; // 关联的岔芯对应的道岔id，此时该逻辑区段为该道岔C端关联的轨道link
uint32 newaxleSectionId = 7; // 关联的计轴区段Id
uint32 newturnoutId = 8; // 关联的岔芯对应的道岔id，此时该逻辑区段为该道岔C端关联的轨道link
string oldturnoutId = 6; // 关联的岔芯对应的道岔id，此时该逻辑区段为该道岔C端关联的轨道link
uint32 axleSectionId = 7; // 关联的计轴区段Id
uint32 turnoutId = 8; // 关联的岔芯对应的道岔id，此时该逻辑区段为该道岔C端关联的轨道link
}
message TrackSection { //轨道区段
@ -473,11 +473,11 @@ message TrackSection { //轨道区段
// int32 index = 4; //索引
TrackSectionType type = 5; //类型
string destinationCode = 6; //目的地码
repeated string trackLogicSection = 7; //下属的逻辑区段id(非岔区)
repeated string oldtrackLogicSection = 7; //下属的逻辑区段id(非岔区)
// //关联的物理设备id(物理区段/道岔)由另一端(物理区段/道岔处理)
bool isCurve = 8; // 是否曲线
int32 segmentsCount = 9; // 曲线分段数
repeated uint32 newtrackLogicSection = 10; //下属的逻辑区段id(非岔区)
repeated uint32 trackLogicSection = 10; //下属的逻辑区段id(非岔区)
}
message TrackLogicSection { //轨道逻辑区段
@ -508,10 +508,10 @@ message SpksSwitch {
bool flip = 3; // 是否翻转（前端显示）
// int32 index = 4; //索引
// int32 refStand = 5; //关联站台索引
repeated string refSections = 6; // 关联物理区段id
string refStand = 7; // 关联站台
repeated uint32 newrefSections = 8; // 关联物理区段id
uint32 newrefStand = 9; // 关联站台
repeated string oldrefSections = 6; // 关联物理区段id
string oldrefStand = 7; // 关联站台
repeated uint32 refSections = 8; // 关联物理区段id
uint32 refStand = 9; // 关联站台
}
message EsbButton {
@ -520,8 +520,8 @@ message EsbButton {
bool flip = 3; // 是否翻转（前端显示）
// int32 index = 4; //索引
// int32 refStand = 5; // 关联站台索引
string refStand = 6; // 关联站台
uint32 newrefStand = 7; // 关联站台
string oldrefStand = 6; // 关联站台
uint32 refStand = 7; // 关联站台
}
message GatedBox {
@ -529,9 +529,9 @@ message GatedBox {
string code = 2;
bool flip = 3; // 是否翻转（前端显示）
// int32 index = 4; //索引
string refScreenDoor = 5; // 关联屏蔽门
string oldrefScreenDoor = 5; // 关联屏蔽门
string refGatedBoxMapCode = 6; // 关联门控箱地图Code
uint32 newrefScreenDoor = 7; // 关联屏蔽门
uint32 refScreenDoor = 7; // 关联屏蔽门
}
/** 坡度公里标 */
@ -564,16 +564,16 @@ message Slope {
CommonInfo common = 1;
repeated Point points = 2;
sint32 slopeNumber = 3; //坡度的值--正负代表上下坡
repeated string refDeviceId = 4; // 坡度关联的(坡度公里标)
repeated uint32 newrefDeviceId = 5; // 坡度关联的(坡度公里标)
repeated string oldrefDeviceId = 4; // 坡度关联的(坡度公里标)
repeated uint32 refDeviceId = 5; // 坡度关联的(坡度公里标)
}
message Curvature {
CommonInfo common = 1;
repeated Point points = 2;
sint32 curvatureNumber = 3; //曲线的半径--正代表外侧；负代表内侧
repeated string refDeviceId = 4; // 曲线关联的(曲度公里标)
repeated uint32 newrefDeviceId = 5; // 曲线关联的(曲度公里标)
repeated string oldrefDeviceId = 4; // 曲线关联的(曲度公里标)
repeated uint32 refDeviceId = 5; // 曲线关联的(曲度公里标)
}
// 计算link结构
@ -595,9 +595,9 @@ message CalculateLink {
message DepartureTimer {
CommonInfo common = 1;
string code = 2;
string refStand = 3; // 关联站台
string oldrefStand = 3; // 关联站台
string runDirection = 4; //运行方向
uint32 newrefStand = 5; // 关联站台
uint32 refStand = 5; // 关联站台
}
message AutoReturnBox {
@ -605,8 +605,8 @@ message AutoReturnBox {
string code = 2;
bool flip = 3; // 是否翻转（前端显示）
int32 index = 4; //索引
string refStand = 5; // 关联站台
uint32 newrefStand = 6; // 关联站台
string oldrefStand = 5; // 关联站台
uint32 refStand = 6; // 关联站台
}
message UniqueIdOfStationLayout {
@ -630,14 +630,14 @@ message StationRelateDevice {
}
message DeviceCombinationtype {
string code = 1;
repeated string refDevices = 2;//车站关联的设备
repeated int32 newrefDevices = 3;//车站关联的设备
repeated string oldrefDevices = 2;//车站关联的设备
repeated int32 refDevices = 3;//车站关联的设备
}
message SectionCodePoint {
string centralizedStation = 1;
repeated string sectionIds = 2; //物理区段id列表
repeated uint32 newsectionIds = 3; //物理区段id列表
repeated string oldsectionIds = 2; //物理区段id列表
repeated uint32 sectionIds = 3; //物理区段id列表
}
// 列车信息
@ -659,6 +659,6 @@ message Train {
// 其他线
message OtherLine {
string name = 1;
repeated string ids = 2; // 设备id列表
repeated uint32 newids = 3; // 设备id列表
repeated string oldids = 2; // 设备id列表
repeated uint32 ids = 3; // 设备id列表
}