zhanghaijun лет назад: 2
Родитель
Сommit
729fc2d395

+ 6 - 4
train-server/src/main/java/top/haijunit/train/domain/entity/SelectionEntity.java

@@ -1,15 +1,13 @@
 package top.haijunit.train.domain.entity;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
+import jakarta.persistence.*;
 import lombok.Data;
 import top.haijunit.train.domain.constant.DirectionEnum;
 import top.haijunit.train.domain.constant.RouteStatusEnum;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * @author zhang
@@ -41,4 +39,8 @@ public class SelectionEntity implements Serializable {
     private Long stationId;
     // 区段状态
     private RouteStatusEnum status;
+
+    // @OneToMany
+    // @JoinColumn(name = "selection_id")
+    // private List<SignStopEntity> signStopList;
 }

+ 1 - 1
train-server/src/main/java/top/haijunit/train/domain/repository/SelectionRepository.java

@@ -7,7 +7,7 @@ import top.haijunit.train.domain.entity.SelectionEntity;
 /**
  * @author zhang
  * @date 2023/11/26 02:03
- * @description [一句话描述该类的功能]
+ * @description 区段DAO
  */
 @Repository
 public interface SelectionRepository extends JpaRepository<SelectionEntity, Long> {

+ 15 - 1
train-server/src/main/java/top/haijunit/train/simulation/TrainComputerService.java

@@ -2,8 +2,13 @@ package top.haijunit.train.simulation;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
+import top.haijunit.train.domain.entity.RouteEntity;
+import top.haijunit.train.domain.entity.SelectionEntity;
+import top.haijunit.train.domain.repository.SelectionRepository;
+
+import java.util.LinkedList;
+import java.util.List;
 
 /**
  * @author zhanghaijun
@@ -15,7 +20,16 @@ import org.springframework.stereotype.Service;
 @RequiredArgsConstructor
 public class TrainComputerService {
 
+    private SelectionRepository selectionRepository;
+
     public void run(TrainItem trainItem) {
+        LinkedList<RouteEntity> routeList = TrainSimulationHolder.getRouteList(trainItem.getId());
+        if (routeList!= null &&!routeList.isEmpty()) {
+            // 没有触发进路
+            return;
+        }
+        List<SelectionEntity> selectionEntities = selectionRepository.findAll();
+
 
     }
 }