进路触发逻辑

train-server/src/main/java/top/haijunit/train/domain/entity/SwitchEntity.java

@@ -7,6 +7,7 @@ import top.haijunit.train.domain.constant.SwitchStateEnum;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalTime;
+import java.util.Date;
 
 /**
  * @author zhang
@@ -39,7 +40,7 @@ public class SwitchEntity implements Serializable {
     private Long stationId;
 
     // 道岔状态的更新时间
-    private LocalTime updateStateTime;
+    private Date updateStateTime;
     // 道岔的状态
     private SwitchStateEnum switchState;
 }

train-server/src/main/java/top/haijunit/train/service/SwitchService.java

@@ -9,6 +9,7 @@ import top.haijunit.train.domain.entity.SwitchEntity;
 import top.haijunit.train.domain.repository.SwitchRepository;
 
 import java.time.LocalTime;
+import java.util.Date;
 import java.util.Map;
 
 /**
@@ -42,7 +43,7 @@ public class SwitchService {
             }
             if (switchEntity.getSwitchState() != entry.getValue()) {
                 switchEntity.setSwitchState(entry.getValue());
-                switchEntity.setUpdateStateTime(LocalTime.now());
+                switchEntity.setUpdateStateTime(new Date());
                 switchRepository.save(switchEntity);
                 isChanged = true;
             }

train-server/src/main/java/top/haijunit/train/simulation/RouteComputerService.java

@@ -1,9 +1,11 @@
 package top.haijunit.train.simulation;
 
+import cn.hutool.core.collection.CollUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
+import top.haijunit.common.utils.StreamUtils;
 import top.haijunit.train.domain.constant.RouteStatusEnum;
 import top.haijunit.train.domain.constant.SignalStateEnum;
 import top.haijunit.train.domain.entity.RouteEntity;
@@ -54,7 +56,7 @@ public class RouteComputerService {
         }
         // 找到下一个进路
         RouteEntity nextRoute = routeService.getNextRoute(routeTrigger.getId());
-        if (null == nextRoute || routeList.contains(nextRoute)) {
+        if (null == nextRoute || !StreamUtils.filter(routeList, (item -> item.getId().equals(nextRoute.getId()))).isEmpty()) {
             // 没有找到下一个进路
             return routeList;
         }