Merge remote-tracking branch 'origin/master'

This commit is contained in:
thesai 2024-03-29 16:46:49 +08:00
commit f566f96c40

View File

@ -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; //01
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; // idC端关联的轨道link
//string oldturnoutId = 6; // idC端关联的轨道link
uint32 axleSectionId = 7; // Id
uint32 turnoutId = 8; // idC端关联的轨道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列表
}