联调修复

train-server/src/main/java/top/haijunit/train/domain/repository/PlatformDoorRepository.java

@@ -16,6 +16,10 @@ import java.util.List;
 @Repository
 public interface PlatformDoorRepository extends JpaRepository<PlatformDoorEntity, Long> {
 
+
+    @Query("SELECT d FROM db_platform_door d WHERE d.id IN (?1)")
+    List<PlatformDoorEntity> findByIdIn(List<Long> ids);
+
     /**
      * 根据平台id和控制来源查询屏蔽门
      */
@@ -25,7 +29,7 @@ public interface PlatformDoorRepository extends JpaRepository<PlatformDoorEntity
     /**
      * 根据站台id和方向查询屏蔽门
      */
-    @Query("SELECT d FROM db_platform_door d WHERE d.stationId = ?1 AND d.direction=?2 AND d.controlOrigin IN (?3)")
+    @Query("SELECT d FROM db_platform_door d WHERE d.stationId = ?1 AND d.direction=?2 AND d.controlOrigin IN (?3) AND d.status != 2")
     List<PlatformDoorEntity> getStationIdAndDirection(Long stationId, DirectionEnum direction, List<String> controlOrigins);
 
     @Query("SELECT d FROM db_platform_door d WHERE d.stationId = ?1 AND d.direction = ?2 AND d.status = 1")

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

@@ -12,13 +12,13 @@ import top.haijunit.train.device.entity.DeviceEntity;
 import top.haijunit.train.domain.constant.ControlConstant;
 import top.haijunit.train.domain.constant.DirectionEnum;
 import top.haijunit.train.domain.constant.DoorStatusEnum;
+import top.haijunit.train.domain.constant.TrainConstant;
 import top.haijunit.train.domain.entity.PlatformDoorEntity;
 import top.haijunit.train.domain.repository.PlatformDoorRepository;
+import top.haijunit.train.simulation.domain.SectionItem;
 import top.haijunit.train.utils.TrainWebSocketUtils;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 
 /**
  * @author zhanghaijun
@@ -35,8 +35,9 @@ public class PlatformDoorService {
     /**
      * 列车行驶进入站台判断是否有屏蔽门打开的情况，需要情急停车
      */
-    public boolean existDoorOpen(Long stationId, DirectionEnum direction) {
-        return !platformDoorRepository.getDoorOpen(stationId, direction).isEmpty();
+    public boolean existDoorOpen(LinkedList<SectionItem> sectionList, Long blockId, DirectionEnum direction) {
+        Optional<SectionItem> optional = sectionList.stream().filter(item -> item.getSectionId().equals(blockId)).findFirst();
+        return optional.filter(sectionItem -> !platformDoorRepository.getDoorOpen(sectionItem.getStationId(), direction).isEmpty()).isPresent();
     }
 
     public void updateDoorControl(DeviceEntity entity) {
@@ -70,14 +71,18 @@ public class PlatformDoorService {
                 // LCW 更新屏蔽门
                 Long doorId = Convert.toLong(entity.getCode(), 0L);
                 switch (entity.getStatus()) {
+                    case 0:
+                        // 恢复自动状态
+                        updateDoorStatus(ControlConstant.DoorControl.AUTO, DoorStatusEnum.CLOSE, platformDoorRepository.findByIdIn(Collections.singletonList(doorId)));
+                        break;
                     case 1:
-                        updateDoorStatus(ControlConstant.DoorControl.LCW, DoorStatusEnum.OPEN, Collections.singletonList(platformDoorRepository.getReferenceById(doorId)));
+                        updateDoorStatus(ControlConstant.DoorControl.LCW, DoorStatusEnum.OPEN, platformDoorRepository.findByIdIn(Collections.singletonList(doorId)));
                         break;
                     case 2:
-                        updateDoorStatus(ControlConstant.DoorControl.LCW, DoorStatusEnum.CLOSE, Collections.singletonList(platformDoorRepository.getReferenceById(doorId)));
+                        updateDoorStatus(ControlConstant.DoorControl.LCW, DoorStatusEnum.CLOSE, platformDoorRepository.findByIdIn(Collections.singletonList(doorId)));
                         break;
                     case 3:
-                        updateDoorStatus(ControlConstant.DoorControl.LCW, DoorStatusEnum.DISABLE, Collections.singletonList(platformDoorRepository.getReferenceById(doorId)));
+                        updateDoorStatus(ControlConstant.DoorControl.LCW, DoorStatusEnum.DISABLE, platformDoorRepository.findByIdIn(Collections.singletonList(doorId)));
                         break;
                 }
                 break;
@@ -92,14 +97,14 @@ public class PlatformDoorService {
         List<String> originList = new ArrayList<>();
         switch (origin) {
             case "LCW":
-                originList.add(origin);
+                originList.add("LCW");
             case "PSL":
-                originList.add(origin);
+                originList.add("PSL");
             case "IBP":
-                originList.add(origin);
+                originList.add("IBP");
             case "AUTO":
             default:
-                originList.add(origin);
+                originList.add("AUTO");
         }
         return originList;
     }
@@ -113,10 +118,15 @@ public class PlatformDoorService {
         if (CollUtil.isEmpty(list)) {
             return false;
         }
-        list.forEach(entity -> {
-            entity.setControlOrigin(effect ? origin : ControlConstant.DoorControl.AUTO);
-            platformDoorRepository.save(entity);
-        });
+        if (effect) {
+            list.forEach(entity -> {
+                entity.setControlOrigin(origin);
+                platformDoorRepository.save(entity);
+            });
+        } else {
+            // 恢复自动模式
+            updateDoorStatus(ControlConstant.DoorControl.AUTO, DoorStatusEnum.CLOSE, list);
+        }
         return true;
     }
 
@@ -154,9 +164,6 @@ public class PlatformDoorService {
     private void updateDoorStatus(String origin, DoorStatusEnum state, List<PlatformDoorEntity> doorList) {
         List<PlatformDoorEntity> list = new ArrayList<>();
         for (PlatformDoorEntity entity : doorList) {
-            if (entity.getStatus() == DoorStatusEnum.DISABLE) {
-                continue;
-            }
             entity.setStatus(state);
             entity.setControlOrigin(origin);
             list.add(entity);

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

@@ -69,7 +69,7 @@ public class TrainComputerService {
                 train.setOpenDoor(this.openOrCloseDoor(sectionList, train, timeDifference > (TrainConstant.STOP_TIME_SECOND - 2) * 1000 ? DoorStatusEnum.CLOSE : DoorStatusEnum.OPEN));
                 return train;
             }
-            if (platformDoorService.existDoorOpen(train.getBlockId(), train.getDirection())) {
+            if (platformDoorService.existDoorOpen(sectionList, train.getBlockId(), train.getDirection())) {
                 // 进入站台存在屏蔽门打开的情况，继续停车
                 return train;
             }
@@ -111,10 +111,12 @@ public class TrainComputerService {
                                 // 折返后再次停车30s
                                 train.setSpeed(BigDecimal.ZERO);
                                 train.setAcceleration(BigDecimal.ZERO);
+                                train.setStopTimeMillis(nowMillis);
                                 return train;
                             } else {
                                 train.setSpeed(BigDecimal.ZERO);
                                 train.setAcceleration(BigDecimal.ZERO);
+                                train.setStopTimeMillis(nowMillis);
                                 return train;
                             }
                         }
@@ -131,10 +133,12 @@ public class TrainComputerService {
                                 // 折返后再次停车30s
                                 train.setSpeed(BigDecimal.ZERO);
                                 train.setAcceleration(BigDecimal.ZERO);
+                                train.setStopTimeMillis(nowMillis);
                                 return train;
                             } else {
                                 train.setSpeed(BigDecimal.ZERO);
                                 train.setAcceleration(BigDecimal.ZERO);
+                                train.setStopTimeMillis(nowMillis);
                                 return train;
                             }
                         }
@@ -143,7 +147,7 @@ public class TrainComputerService {
             }
         }
         // 紧急停车 进入站台存在屏蔽门打开的情况
-        if (platformDoorService.existDoorOpen(train.getBlockId(), train.getDirection())) {
+        if (platformDoorService.existDoorOpen(sectionList, train.getBlockId(), train.getDirection())) {
             train.setAcceleration(TrainConstant.DECELERATION_LIMIT);
             return train;
         }

train-server/src/main/resources/db/changelog/train/db-server-train.xml

@@ -262,6 +262,7 @@
             <column name="name" type="STRING"/>
             <column name="status" type="NUMERIC"/>
             <column name="direction" type="NUMERIC"/>
+            <column name="platform_id" type="NUMERIC"/>
             <column name="station_id" type="NUMERIC"/>
         </loadUpdateData>
     </changeSet>

train-server/src/main/resources/db/changelog/train/db_platform_door.txt

@@ -1,186 +1,186 @@
-id,name,status,direction,station_id
-138001,SA1-1,0,1,104001
-138002,SA1-2,0,1,104001
-138003,SA1-3,0,1,104001
-138004,SA1-4,0,1,104001
-138005,SA1-5,0,1,104001
-138006,SA2-1,0,1,104001
-138007,SA2-2,0,1,104001
-138008,SA2-3,0,1,104001
-138009,SA2-4,0,1,104001
-138010,SA2-5,0,1,104001
-138011,SA3-1,0,1,104001
-138012,SA3-2,0,1,104001
-138013,SA3-3,0,1,104001
-138014,SA3-4,0,1,104001
-138015,SA3-5,0,1,104001
-138016,SA4-1,0,1,104001
-138017,SA4-2,0,1,104001
-138018,SA4-3,0,1,104001
-138019,SA4-4,0,1,104001
-138020,SA4-5,0,1,104001
-138021,SA5-1,0,1,104001
-138022,SA5-2,0,1,104001
-138023,SA5-3,0,1,104001
-138024,SA5-4,0,1,104001
-138025,SA5-5,0,1,104001
-138026,SA6-1,0,1,104001
-138027,SA6-2,0,1,104001
-138028,SA6-3,0,1,104001
-138029,SA6-4,0,1,104001
-138030,SA6-5,0,1,104001
+id,name,status,direction,platform_id,station_id
+138001,SA1-1,0,1,105001,104001
+138002,SA1-2,0,1,105001,104001
+138003,SA1-3,0,1,105001,104001
+138004,SA1-4,0,1,105001,104001
+138005,SA1-5,0,1,105001,104001
+138006,SA2-1,0,1,105001,104001
+138007,SA2-2,0,1,105001,104001
+138008,SA2-3,0,1,105001,104001
+138009,SA2-4,0,1,105001,104001
+138010,SA2-5,0,1,105001,104001
+138011,SA3-1,0,1,105001,104001
+138012,SA3-2,0,1,105001,104001
+138013,SA3-3,0,1,105001,104001
+138014,SA3-4,0,1,105001,104001
+138015,SA3-5,0,1,105001,104001
+138016,SA4-1,0,1,105001,104001
+138017,SA4-2,0,1,105001,104001
+138018,SA4-3,0,1,105001,104001
+138019,SA4-4,0,1,105001,104001
+138020,SA4-5,0,1,105001,104001
+138021,SA5-1,0,1,105001,104001
+138022,SA5-2,0,1,105001,104001
+138023,SA5-3,0,1,105001,104001
+138024,SA5-4,0,1,105001,104001
+138025,SA5-5,0,1,105001,104001
+138026,SA6-1,0,1,105001,104001
+138027,SA6-2,0,1,105001,104001
+138028,SA6-3,0,1,105001,104001
+138029,SA6-4,0,1,105001,104001
+138030,SA6-5,0,1,105001,104001
 
-138031,XA1-1,0,2,104001
-138032,XA1-2,0,2,104001
-138033,XA1-3,0,2,104001
-138034,XA1-4,0,2,104001
-138035,XA1-5,0,2,104001
-138036,XA2-1,0,2,104001
-138037,XA2-2,0,2,104001
-138038,XA2-3,0,2,104001
-138039,XA2-4,0,2,104001
-138040,XA2-5,0,2,104001
-138041,XA3-1,0,2,104001
-138042,XA3-2,0,2,104001
-138043,XA3-3,0,2,104001
-138044,XA3-4,0,2,104001
-138045,XA3-5,0,2,104001
-138046,XA4-1,0,2,104001
-138047,XA4-2,0,2,104001
-138048,XA4-3,0,2,104001
-138049,XA4-4,0,2,104001
-138050,XA4-5,0,2,104001
-138051,XA5-1,0,2,104001
-138052,XA5-2,0,2,104001
-138053,XA5-3,0,2,104001
-138054,XA5-4,0,2,104001
-138055,XA5-5,0,2,104001
-138056,XA6-1,0,2,104001
-138057,XA6-2,0,2,104001
-138058,XA6-3,0,2,104001
-138059,XA6-4,0,2,104001
-138060,XA6-5,0,2,104001
+138031,XA1-1,0,2,105002,104001
+138032,XA1-2,0,2,105002,104001
+138033,XA1-3,0,2,105002,104001
+138034,XA1-4,0,2,105002,104001
+138035,XA1-5,0,2,105002,104001
+138036,XA2-1,0,2,105002,104001
+138037,XA2-2,0,2,105002,104001
+138038,XA2-3,0,2,105002,104001
+138039,XA2-4,0,2,105002,104001
+138040,XA2-5,0,2,105002,104001
+138041,XA3-1,0,2,105002,104001
+138042,XA3-2,0,2,105002,104001
+138043,XA3-3,0,2,105002,104001
+138044,XA3-4,0,2,105002,104001
+138045,XA3-5,0,2,105002,104001
+138046,XA4-1,0,2,105002,104001
+138047,XA4-2,0,2,105002,104001
+138048,XA4-3,0,2,105002,104001
+138049,XA4-4,0,2,105002,104001
+138050,XA4-5,0,2,105002,104001
+138051,XA5-1,0,2,105002,104001
+138052,XA5-2,0,2,105002,104001
+138053,XA5-3,0,2,105002,104001
+138054,XA5-4,0,2,105002,104001
+138055,XA5-5,0,2,105002,104001
+138056,XA6-1,0,2,105002,104001
+138057,XA6-2,0,2,105002,104001
+138058,XA6-3,0,2,105002,104001
+138059,XA6-4,0,2,105002,104001
+138060,XA6-5,0,2,105002,104001
 
-138061,SA1-1,0,1,104002
-138062,SA1-2,0,1,104002
-138063,SA1-3,0,1,104002
-138064,SA1-4,0,1,104002
-138065,SA1-5,0,1,104002
-138066,SA2-1,0,1,104002
-138067,SA2-2,0,1,104002
-138068,SA2-3,0,1,104002
-138069,SA2-4,0,1,104002
-138070,SA2-5,0,1,104002
-138071,SA3-1,0,1,104002
-138072,SA3-2,0,1,104002
-138073,SA3-3,0,1,104002
-138074,SA3-4,0,1,104002
-138075,SA3-5,0,1,104002
-138076,SA4-1,0,1,104002
-138077,SA4-2,0,1,104002
-138078,SA4-3,0,1,104002
-138079,SA4-4,0,1,104002
-138080,SA4-5,0,1,104002
-138081,SA5-1,0,1,104002
-138082,SA5-2,0,1,104002
-138083,SA5-3,0,1,104002
-138084,SA5-4,0,1,104002
-138085,SA5-5,0,1,104002
-138086,SA6-1,0,1,104002
-138087,SA6-2,0,1,104002
-138088,SA6-3,0,1,104002
-138089,SA6-4,0,1,104002
-138090,SA6-5,0,1,104002
+138061,SA1-1,0,1,105003,104002
+138062,SA1-2,0,1,105003,104002
+138063,SA1-3,0,1,105003,104002
+138064,SA1-4,0,1,105003,104002
+138065,SA1-5,0,1,105003,104002
+138066,SA2-1,0,1,105003,104002
+138067,SA2-2,0,1,105003,104002
+138068,SA2-3,0,1,105003,104002
+138069,SA2-4,0,1,105003,104002
+138070,SA2-5,0,1,105003,104002
+138071,SA3-1,0,1,105003,104002
+138072,SA3-2,0,1,105003,104002
+138073,SA3-3,0,1,105003,104002
+138074,SA3-4,0,1,105003,104002
+138075,SA3-5,0,1,105003,104002
+138076,SA4-1,0,1,105003,104002
+138077,SA4-2,0,1,105003,104002
+138078,SA4-3,0,1,105003,104002
+138079,SA4-4,0,1,105003,104002
+138080,SA4-5,0,1,105003,104002
+138081,SA5-1,0,1,105003,104002
+138082,SA5-2,0,1,105003,104002
+138083,SA5-3,0,1,105003,104002
+138084,SA5-4,0,1,105003,104002
+138085,SA5-5,0,1,105003,104002
+138086,SA6-1,0,1,105003,104002
+138087,SA6-2,0,1,105003,104002
+138088,SA6-3,0,1,105003,104002
+138089,SA6-4,0,1,105003,104002
+138090,SA6-5,0,1,105003,104002
 
-138091,XA1-1,0,2,104002
-138092,XA1-2,0,2,104002
-138093,XA1-3,0,2,104002
-138094,XA1-4,0,2,104002
-138095,XA1-5,0,2,104002
-138096,XA2-1,0,2,104002
-138097,XA2-2,0,2,104002
-138098,XA2-3,0,2,104002
-138099,XA2-4,0,2,104002
-138100,XA2-5,0,2,104002
-138101,XA3-1,0,2,104002
-138102,XA3-2,0,2,104002
-138103,XA3-3,0,2,104002
-138104,XA3-4,0,2,104002
-138105,XA3-5,0,2,104002
-138106,XA4-1,0,2,104002
-138107,XA4-2,0,2,104002
-138108,XA4-3,0,2,104002
-138109,XA4-4,0,2,104002
-138110,XA4-5,0,2,104002
-138111,XA5-1,0,2,104002
-138112,XA5-2,0,2,104002
-138113,XA5-3,0,2,104002
-138114,XA5-4,0,2,104002
-138115,XA5-5,0,2,104002
-138116,XA6-1,0,2,104002
-138117,XA6-2,0,2,104002
-138118,XA6-3,0,2,104002
-138119,XA6-4,0,2,104002
-138120,XA6-5,0,2,104002
+138091,XA1-1,0,2,105004,104002
+138092,XA1-2,0,2,105004,104002
+138093,XA1-3,0,2,105004,104002
+138094,XA1-4,0,2,105004,104002
+138095,XA1-5,0,2,105004,104002
+138096,XA2-1,0,2,105004,104002
+138097,XA2-2,0,2,105004,104002
+138098,XA2-3,0,2,105004,104002
+138099,XA2-4,0,2,105004,104002
+138100,XA2-5,0,2,105004,104002
+138101,XA3-1,0,2,105004,104002
+138102,XA3-2,0,2,105004,104002
+138103,XA3-3,0,2,105004,104002
+138104,XA3-4,0,2,105004,104002
+138105,XA3-5,0,2,105004,104002
+138106,XA4-1,0,2,105004,104002
+138107,XA4-2,0,2,105004,104002
+138108,XA4-3,0,2,105004,104002
+138109,XA4-4,0,2,105004,104002
+138110,XA4-5,0,2,105004,104002
+138111,XA5-1,0,2,105004,104002
+138112,XA5-2,0,2,105004,104002
+138113,XA5-3,0,2,105004,104002
+138114,XA5-4,0,2,105004,104002
+138115,XA5-5,0,2,105004,104002
+138116,XA6-1,0,2,105004,104002
+138117,XA6-2,0,2,105004,104002
+138118,XA6-3,0,2,105004,104002
+138119,XA6-4,0,2,105004,104002
+138120,XA6-5,0,2,105004,104002
 
-138121,SA1-1,0,1,104003
-138122,SA1-2,0,1,104003
-138123,SA1-3,0,1,104003
-138124,SA1-4,0,1,104003
-138125,SA1-5,0,1,104003
-138126,SA2-1,0,1,104003
-138127,SA2-2,0,1,104003
-138128,SA2-3,0,1,104003
-138129,SA2-4,0,1,104003
-138130,SA2-5,0,1,104003
-138131,SA3-1,0,1,104003
-138132,SA3-2,0,1,104003
-138133,SA3-3,0,1,104003
-138134,SA3-4,0,1,104003
-138135,SA3-5,0,1,104003
-138136,SA4-1,0,1,104003
-138137,SA4-2,0,1,104003
-138138,SA4-3,0,1,104003
-138139,SA4-4,0,1,104003
-138140,SA4-5,0,1,104003
-138141,SA5-1,0,1,104003
-138142,SA5-2,0,1,104003
-138143,SA5-3,0,1,104003
-138144,SA5-4,0,1,104003
-138145,SA5-5,0,1,104003
-138146,SA6-1,0,1,104003
-138147,SA6-2,0,1,104003
-138148,SA6-3,0,1,104003
-138149,SA6-4,0,1,104003
-138150,SA6-5,0,1,104003
+138121,SA1-1,0,1,105005,104003
+138122,SA1-2,0,1,105005,104003
+138123,SA1-3,0,1,105005,104003
+138124,SA1-4,0,1,105005,104003
+138125,SA1-5,0,1,105005,104003
+138126,SA2-1,0,1,105005,104003
+138127,SA2-2,0,1,105005,104003
+138128,SA2-3,0,1,105005,104003
+138129,SA2-4,0,1,105005,104003
+138130,SA2-5,0,1,105005,104003
+138131,SA3-1,0,1,105005,104003
+138132,SA3-2,0,1,105005,104003
+138133,SA3-3,0,1,105005,104003
+138134,SA3-4,0,1,105005,104003
+138135,SA3-5,0,1,105005,104003
+138136,SA4-1,0,1,105005,104003
+138137,SA4-2,0,1,105005,104003
+138138,SA4-3,0,1,105005,104003
+138139,SA4-4,0,1,105005,104003
+138140,SA4-5,0,1,105005,104003
+138141,SA5-1,0,1,105005,104003
+138142,SA5-2,0,1,105005,104003
+138143,SA5-3,0,1,105005,104003
+138144,SA5-4,0,1,105005,104003
+138145,SA5-5,0,1,105005,104003
+138146,SA6-1,0,1,105005,104003
+138147,SA6-2,0,1,105005,104003
+138148,SA6-3,0,1,105005,104003
+138149,SA6-4,0,1,105005,104003
+138150,SA6-5,0,1,105005,104003
 
-138151,XA1-1,0,2,104003
-138152,XA1-2,0,2,104003
-138153,XA1-3,0,2,104003
-138154,XA1-4,0,2,104003
-138155,XA1-5,0,2,104003
-138156,XA2-1,0,2,104003
-138157,XA2-2,0,2,104003
-138158,XA2-3,0,2,104003
-138159,XA2-4,0,2,104003
-138160,XA2-5,0,2,104003
-138161,XA3-1,0,2,104003
-138162,XA3-2,0,2,104003
-138163,XA3-3,0,2,104003
-138164,XA3-4,0,2,104003
-138165,XA3-5,0,2,104003
-138166,XA4-1,0,2,104003
-138167,XA4-2,0,2,104003
-138168,XA4-3,0,2,104003
-138169,XA4-4,0,2,104003
-138170,XA4-5,0,2,104003
-138171,XA5-1,0,2,104003
-138172,XA5-2,0,2,104003
-138173,XA5-3,0,2,104003
-138174,XA5-4,0,2,104003
-138175,XA5-5,0,2,104003
-138176,XA6-1,0,2,104003
-138177,XA6-2,0,2,104003
-138178,XA6-3,0,2,104003
-138179,XA6-4,0,2,104003
-138180,XA6-5,0,2,104003
+138151,XA1-1,0,2,105006,104003
+138152,XA1-2,0,2,105006,104003
+138153,XA1-3,0,2,105006,104003
+138154,XA1-4,0,2,105006,104003
+138155,XA1-5,0,2,105006,104003
+138156,XA2-1,0,2,105006,104003
+138157,XA2-2,0,2,105006,104003
+138158,XA2-3,0,2,105006,104003
+138159,XA2-4,0,2,105006,104003
+138160,XA2-5,0,2,105006,104003
+138161,XA3-1,0,2,105006,104003
+138162,XA3-2,0,2,105006,104003
+138163,XA3-3,0,2,105006,104003
+138164,XA3-4,0,2,105006,104003
+138165,XA3-5,0,2,105006,104003
+138166,XA4-1,0,2,105006,104003
+138167,XA4-2,0,2,105006,104003
+138168,XA4-3,0,2,105006,104003
+138169,XA4-4,0,2,105006,104003
+138170,XA4-5,0,2,105006,104003
+138171,XA5-1,0,2,105006,104003
+138172,XA5-2,0,2,105006,104003
+138173,XA5-3,0,2,105006,104003
+138174,XA5-4,0,2,105006,104003
+138175,XA5-5,0,2,105006,104003
+138176,XA6-1,0,2,105006,104003
+138177,XA6-2,0,2,105006,104003
+138178,XA6-3,0,2,105006,104003
+138179,XA6-4,0,2,105006,104003
+138180,XA6-5,0,2,105006,104003

train-server/src/main/resources/static/assets/404-fc9a56c8.js

@@ -1 +1 @@
-import{_ as t}from"./_plugin-vue_export-helper-c27b6911.js";import{W as o,o as r,f as n,$ as s,w as a,X as c,Y as _}from"./index-5ff9d12b.js";const d={},i={style:{"border-radius":"8px",border:"1px solid #3666",margin:"0 auto",width:"600px","text-align":"center",padding:"50px"}},l=c("h2",null,"页面找不到",-1);function p(x,f){const e=o("router-link");return r(),n("div",i,[l,s(e,{to:"/"},{default:a(()=>[_(" 跳转首页 ")]),_:1})])}const h=t(d,[["render",p]]);export{h as default};
+import{_ as t}from"./_plugin-vue_export-helper-c27b6911.js";import{W as o,o as r,f as n,$ as s,w as a,X as c,Y as _}from"./index-c87bf13d.js";const d={},i={style:{"border-radius":"8px",border:"1px solid #3666",margin:"0 auto",width:"600px","text-align":"center",padding:"50px"}},l=c("h2",null,"页面找不到",-1);function p(x,f){const e=o("router-link");return r(),n("div",i,[l,s(e,{to:"/"},{default:a(()=>[_(" 跳转首页 ")]),_:1})])}const h=t(d,[["render",p]]);export{h as default};

train-server/src/main/resources/static/assets/HomeIndex-e0d61122.js

@@ -1 +1 @@
-import{_ as e}from"./_plugin-vue_export-helper-c27b6911.js";import{o,f as r}from"./index-5ff9d12b.js";const c={};function n(t,s){return o(),r("h2",null,"欢迎访问")}const f=e(c,[["render",n]]);export{f as default};
+import{_ as e}from"./_plugin-vue_export-helper-c27b6911.js";import{o,f as r}from"./index-c87bf13d.js";const c={};function n(t,s){return o(),r("h2",null,"欢迎访问")}const f=e(c,[["render",n]]);export{f as default};

train-server/src/main/resources/static/assets/HomeIndex-legacy-dff1433a.js

@@ -1 +1 @@
-System.register(["./_plugin-vue_export-helper-legacy-762b7923.js","./index-legacy-8e247a63.js"],(function(e,t){"use strict";var r,n,u;return{setters:[e=>{r=e._},e=>{n=e.o,u=e.f}],execute:function(){e("default",r({},[["render",function(e,t){return n(),u("h2",null,"欢迎访问")}]]))}}}));
+System.register(["./_plugin-vue_export-helper-legacy-762b7923.js","./index-legacy-9ea7729d.js"],(function(e,t){"use strict";var r,n,u;return{setters:[e=>{r=e._},e=>{n=e.o,u=e.f}],execute:function(){e("default",r({},[["render",function(e,t){return n(),u("h2",null,"欢迎访问")}]]))}}}));

train-server/src/main/resources/static/index.html

@@ -5,7 +5,7 @@
     <link rel="icon" type="image/svg+xml" href="/logo.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>城轨车站多智能体虚拟场景演练系统</title>
-    <script type="module" crossorigin src="/assets/index-5ff9d12b.js"></script>
+    <script type="module" crossorigin src="/assets/index-c87bf13d.js"></script>
     <link rel="stylesheet" href="/assets/index-534d28ba.css">
     <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};if(location.protocol!="file:"){window.__vite_is_modern_browser=true}</script>
     <script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy chunks, syntax error above and the same error below should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script>
@@ -15,6 +15,6 @@
     
     <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
     <script nomodule crossorigin id="vite-legacy-polyfill" src="/assets/polyfills-legacy-a5617613.js"></script>
-    <script nomodule crossorigin id="vite-legacy-entry" data-src="/assets/index-legacy-8e247a63.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+    <script nomodule crossorigin id="vite-legacy-entry" data-src="/assets/index-legacy-9ea7729d.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
   </body>
 </html>

train-web/src/pages/device/DeviceAfc.vue

@@ -13,16 +13,16 @@ const devices = reactive<DeviceIcon[]>([
   { id: 132005, icon: "售票机", size: 30, style: "left: 50px;top: 220px;" },
   { id: 132006, icon: "售票机", size: 30, style: "left: 50px;top: 270px;" },
   { id: 132007, icon: "售票机", size: 30, style: "left: 50px;top: 320px;" },
-  { id: 132008, icon: "售票机", size: 30, style: "right: 80px;top: 220px;" },
-  { id: 132009, icon: "售票机", size: 30, style: "right: 80px;top: 270px;" },
+  { id: 132009, icon: "售票机", size: 30, style: "right: 80px;top: 220px;" },
+  { id: 132008, icon: "售票机", size: 30, style: "right: 80px;top: 270px;" },
   { id: 132010, icon: "售票机", size: 30, style: "right: 80px;top: 320px;" },
   { id: 131009, icon: "闸机", size: 30, style: "left: 476px;top:362px" },
   { id: 131010, icon: "闸机", size: 30, style: "left: 504px;top:362px" },
   { id: 131011, icon: "闸机", size: 30, style: "left: 533px;top:362px" },
   { id: 131012, icon: "闸机", size: 30, style: "left: 562px;top:362px" },
-  { id: 131013, icon: "闸机", size: 30, style: "left: 710px;top:362px" },
-  { id: 131014, icon: "闸机", size: 30, style: "left: 740px;top:362px" },
-  { id: 131015, icon: "闸机", size: 30, style: "left: 770px;top:362px" },
-  { id: 131016, icon: "闸机", size: 30, style: "left: 798px;top:362px" },
+  { id: 131016, icon: "闸机", size: 30, style: "left: 710px;top:362px" },
+  { id: 131015, icon: "闸机", size: 30, style: "left: 740px;top:362px" },
+  { id: 131014, icon: "闸机", size: 30, style: "left: 770px;top:362px" },
+  { id: 131013, icon: "闸机", size: 30, style: "left: 798px;top:362px" },
 ]);
 </script>

train-web/src/pages/device/DeviceDoor.vue

@@ -46,6 +46,8 @@
               <el-tooltip placement="bottom">
                 <icon-svg :icon-class="doorItem.icon" :color="doorItem.color || '#42BF01'" size="2em"/>
                 <template #content>
+                  <div>{{ '编号: ' + doorItem.item?.id || '' }}</div>
+                  <div>{{ '编号: ' + doorItem.item?.name || '' }}</div>
                   <div>{{ '状态: ' + (doorItem.item?.status == 1 ? '开门' : '关门') }}</div>
                   <div>{{ '控制源: ' + doorItem.item?.controlOrigin }}</div>
                 </template>

train-web/src/pages/device/DeviceElevator.vue

@@ -9,9 +9,9 @@ const devices = reactive<DeviceIcon[]>([
   { id: 134002, icon: "电梯", size: 90, style: "left: 622px;top: 400px;" },
   { id: 135007, icon: "电扶梯左", size: 90, style: "left: 920px;top: 0px;" },
   { id: 135008, icon: "电扶梯左", size: 90, style: "left: 830px;top: 38px;" },
-  { id: 135009, icon: "电扶梯左", size: 120, style: "left: 122px;top: 260px;" },
-  { id: 135010, icon: "电扶梯右", size: 120, style: "left: 1160px;top: 260px;" },
+  { id: 135012, icon: "电扶梯左", size: 120, style: "left: 122px;top: 260px;" },
+  { id: 135009, icon: "电扶梯右", size: 120, style: "left: 1160px;top: 260px;" },
   { id: 135011, icon: "电扶梯右", size: 100, style: "left: 500px;top: 390px;" },
-  { id: 135012, icon: "电扶梯左", size: 100, style: "left: 720px;top: 390px;" },
+  { id: 135010, icon: "电扶梯左", size: 100, style: "left: 720px;top: 390px;" },
 ]);
-</script>
+</script>