【区段增加关联站台属性】

component/cbtc_atp_ground.go

@@ -159,6 +159,8 @@ type TrainRunStatus struct {
 	HeadPosition *DevicePosition // 车头位置
 	TailPosition *DevicePosition // 车尾位置
 	Hold         bool            // 扣车
+	Skip         bool            // 跳停
+	Park         bool            // 停靠
 }
 
 var TrainRunStatusType = ecs.NewComponentType[TrainRunStatus]() // 列车位置状态组件

component/component_proto/ci.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.31.0
+// 	protoc-gen-go v1.28.1
 // 	protoc        v4.23.1
 // source: component/ci.proto
 

component/component_proto/common.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.31.0
+// 	protoc-gen-go v1.28.1
 // 	protoc        v4.23.1
 // source: component/common.proto
 

component/component_proto/psd.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.31.0
+// 	protoc-gen-go v1.28.1
 // 	protoc        v4.23.1
 // source: component/psd.proto
 

component/component_proto/signal.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.31.0
+// 	protoc-gen-go v1.28.1
 // 	protoc        v4.23.1
 // source: component/signal.proto
 

component/component_proto/turnout.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.31.0
+// 	protoc-gen-go v1.28.1
 // 	protoc        v4.23.1
 // source: component/turnout.proto
 

proto/src/model.proto

@@ -216,6 +216,8 @@ enum DeviceType {
 	DeviceType_Breakers = 21;  
   //电源屏
 	DeviceType_PowerScreen = 22;
+  // 进路
+  DeviceType_Route = 23;
   //--------ISCS 编号[300,500]------
 
   //ISCS门磁
@@ -574,18 +576,24 @@ message Route {
     PASS = 3;
     LONG_SHUNTING = 4;
   }
+  message TurnoutPosition {
+    string id = 1; // 道岔ID
+    bool normal = 2; // 道岔定位
+  }
   string id = 1;
   string name = 2;
   // 开始信号机
   string startId = 3;
   // 目的信号机
   string destinationId = 4;
-  // 关联设备ID
+  // 关联区段ID
   repeated string deviceIds = 5;
   // 敌对进路ID
   repeated string conflictingRouteIds = 6;
   // 进路类型
   RouteType routeType = 7;
+  // 对应的道岔位置
+  repeated TurnoutPosition turnouts = 8;
 }
 
 //////////////////////////ISCS///////////////////////////////////

repository/physical_section.go

@@ -35,6 +35,9 @@ type PhysicalSection struct {
 
 	//物理区段所属集中站
 	centralizedStation string
+
+	// 所属站台
+	platform *Platform
 }
 
 func NewPhysicalSection(id string) *PhysicalSection {
@@ -188,6 +191,10 @@ func (s *PhysicalSection) LinkRanges() []*LinkRange {
 	return s.linkRanges
 }
 
+func (p *PhysicalSection) Platform() *Platform {
+	return p.platform
+}
+
 type PhysicalSectionPort struct {
 	section *PhysicalSection
 	port    proto.Port

repository/platform.go

@@ -6,6 +6,7 @@ type Platform struct {
 	Identity
 	code    string
 	station *Station
+	section *PhysicalSection
 }
 
 func NewPlatform(id string, code string) *Platform {
@@ -25,3 +26,7 @@ func (p *Platform) Code() string {
 func (p *Platform) Station() *Station {
 	return p.station
 }
+
+func (p *Platform) Section() *PhysicalSection {
+	return p.section
+}

repository/route.go

@@ -0,0 +1,55 @@
+package repository
+
+import "joylink.club/rtsssimulation/repository/model/proto"
+
+type Route struct {
+	Identity
+	name              string
+	routeType         proto.Route_RouteType
+	start             *Signal
+	destination       *Signal
+	sections          []*PhysicalSection
+	conflictingRoutes []*Route
+	turnoutPositions  []*TurnoutPosition
+}
+
+func NewRoute(id string, name string, routeType proto.Route_RouteType) *Route {
+	return &Route{
+		Identity:  identity{id, proto.DeviceType_DeviceType_Route},
+		name:      name,
+		routeType: routeType,
+	}
+}
+
+func (s *Route) StartSignal() *Signal {
+	return s.start
+}
+
+func (s *Route) DestinationSignal() *Signal {
+	return s.destination
+}
+
+func (s *Route) Sections() []*PhysicalSection {
+	return s.sections
+}
+
+func (s *Route) ConflictingRoutes() []*Route {
+	return s.conflictingRoutes
+}
+
+func (s *Route) TurnoutPositions() []*TurnoutPosition {
+	return s.turnoutPositions
+}
+
+type TurnoutPosition struct {
+	turnout *Turnout
+	normal  bool
+}
+
+func (s *TurnoutPosition) Turnout() *Turnout {
+	return s.turnout
+}
+
+func (s *TurnoutPosition) Position() bool {
+	return s.normal
+}

sys/cbtc_sys/train_run_control.go

@@ -5,6 +5,7 @@ import (
 	"joylink.club/ecs"
 	"joylink.club/ecs/filter"
 	"joylink.club/rtsssimulation/component"
+	"joylink.club/rtsssimulation/entity"
 )
 
 // 列车运行控制组件，给列车增加限制组件
@@ -29,5 +30,30 @@ func (sls *TrainRunControlSys) Update(w ecs.World) {
 		} else {
 			runStatus.SpeedMax = component.TrainSpeedMax
 		}
+		// 检测扣车、跳停
+		worldData := entity.GetWorldData(w)
+		uid := component.UidType.Get(headDevice)
+		section := worldData.Repo.FindPhysicalSection(uid.Id)
+		platform := section.Platform()
+		if platform != nil { // 是站台轨
+			pe := worldData.EntityMap[platform.Id()]
+			// 扣车
+			runStatus.Hold = pe.HasComponent(component.PlatformHoldStatusType)
+			// 跳停
+			skip := pe.HasComponent(component.PlatformSkipStatusType)
+			if pe.HasComponent(component.PlatformSkipStatusType) {
+				st := component.PlatformSkipStatusType.Get(pe)
+				skip = st.AllSkip
+				if !skip {
+					for _, t := range st.Trains {
+						if t.Id() == e.Id() {
+							skip = true
+							break
+						}
+					}
+				}
+			}
+			runStatus.Skip = skip
+		}
 	})
 }