diff --git a/src/main/java/club/joylink/rtss/controller/draft/DraftMapController.java b/src/main/java/club/joylink/rtss/controller/draft/DraftMapController.java index 5cc8565eb..8371f7f7d 100644 --- a/src/main/java/club/joylink/rtss/controller/draft/DraftMapController.java +++ b/src/main/java/club/joylink/rtss/controller/draft/DraftMapController.java @@ -11,6 +11,13 @@ import club.joylink.rtss.vo.client.validGroup.DraftMapCreateCheck; import club.joylink.rtss.vo.client.validGroup.DraftMapCreateFromCheck; import club.joylink.rtss.vo.client.validGroup.DraftMapPublishCheck; import club.joylink.rtss.vo.map.*; +import club.joylink.rtss.vo.map.logic.MapAutoReentryVO; +import club.joylink.rtss.vo.map.logic.MapAutoSignalNewVO; +import club.joylink.rtss.vo.map.logic.MapDestinationCodeDefinitionVO; +import club.joylink.rtss.vo.map.logic.MapRouteNewVO; +import club.joylink.rtss.vo.map.logic.MapRoutingDataVO; +import club.joylink.rtss.vo.map.logic.MapSignalApproachSectionVO; +import club.joylink.rtss.vo.map.logic.MapStationParkingTimeVO; import club.joylink.rtss.vo.map.query.MapAutoReentryQueryVO; import club.joylink.rtss.vo.map.query.MapDestinationCodeDefinitionQueryVO; import club.joylink.rtss.vo.map.query.MapParkTimeQueryVO; diff --git a/src/main/java/club/joylink/rtss/controller/draft/DraftMapFlankProtectionController.java b/src/main/java/club/joylink/rtss/controller/draft/DraftMapFlankProtectionController.java index ad366dc55..a8756e703 100644 --- a/src/main/java/club/joylink/rtss/controller/draft/DraftMapFlankProtectionController.java +++ b/src/main/java/club/joylink/rtss/controller/draft/DraftMapFlankProtectionController.java @@ -2,7 +2,7 @@ package club.joylink.rtss.controller.draft; import club.joylink.rtss.services.draftData.DraftMapFlankProtectionService; import club.joylink.rtss.vo.client.PageVO; -import club.joylink.rtss.vo.map.MapRouteFlankProtectionNewVO; +import club.joylink.rtss.vo.map.logic.MapRouteFlankProtectionNewVO; import club.joylink.rtss.vo.map.query.MapRouteFlankProtectionQueryVO; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/club/joylink/rtss/controller/draft/DraftMapFlsController.java b/src/main/java/club/joylink/rtss/controller/draft/DraftMapFlsController.java index 268122a71..eceaf22b5 100644 --- a/src/main/java/club/joylink/rtss/controller/draft/DraftMapFlsController.java +++ b/src/main/java/club/joylink/rtss/controller/draft/DraftMapFlsController.java @@ -2,7 +2,7 @@ package club.joylink.rtss.controller.draft; import club.joylink.rtss.services.draftData.DraftMapFlsService; import club.joylink.rtss.vo.client.PageVO; -import club.joylink.rtss.vo.map.MapRouteFlankProtectionNewVO; +import club.joylink.rtss.vo.map.logic.MapRouteFlankProtectionNewVO; import club.joylink.rtss.vo.map.query.MapRouteFlankProtectionQueryVO; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/club/joylink/rtss/controller/draft/DraftMapOverlapController.java b/src/main/java/club/joylink/rtss/controller/draft/DraftMapOverlapController.java index b479db135..72b97e272 100644 --- a/src/main/java/club/joylink/rtss/controller/draft/DraftMapOverlapController.java +++ b/src/main/java/club/joylink/rtss/controller/draft/DraftMapOverlapController.java @@ -2,7 +2,7 @@ package club.joylink.rtss.controller.draft; import club.joylink.rtss.services.draftData.DraftMapOverlapService; import club.joylink.rtss.vo.client.PageVO; -import club.joylink.rtss.vo.map.MapOverlapVO; +import club.joylink.rtss.vo.map.logic.MapOverlapVO; import club.joylink.rtss.vo.map.query.MapOverlapQueryVO; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/club/joylink/rtss/controller/draft/DraftMapOverrunController.java b/src/main/java/club/joylink/rtss/controller/draft/DraftMapOverrunController.java index dd05a0de3..1f2d7f59a 100644 --- a/src/main/java/club/joylink/rtss/controller/draft/DraftMapOverrunController.java +++ b/src/main/java/club/joylink/rtss/controller/draft/DraftMapOverrunController.java @@ -3,8 +3,7 @@ package club.joylink.rtss.controller.draft; import club.joylink.rtss.services.draftData.DraftMapOverrunService; import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.map.MapRouteOverrunQueryVO; -import club.joylink.rtss.vo.map.MapRouteNewVO; -import club.joylink.rtss.vo.map.MapRouteOverrunVO; +import club.joylink.rtss.vo.map.logic.MapRouteOverrunVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/club/joylink/rtss/controller/draft/DraftMapParkTimeController.java b/src/main/java/club/joylink/rtss/controller/draft/DraftMapParkTimeController.java index f9703d25f..cbaf1f724 100644 --- a/src/main/java/club/joylink/rtss/controller/draft/DraftMapParkTimeController.java +++ b/src/main/java/club/joylink/rtss/controller/draft/DraftMapParkTimeController.java @@ -1,7 +1,7 @@ package club.joylink.rtss.controller.draft; import club.joylink.rtss.services.draftData.ParkTimeService; -import club.joylink.rtss.vo.map.MapStationParkingTimeVO; +import club.joylink.rtss.vo.map.logic.MapStationParkingTimeVO; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/club/joylink/rtss/controller/draft/DraftMapRouteController.java b/src/main/java/club/joylink/rtss/controller/draft/DraftMapRouteController.java index 5ebb0a392..4e4861bf8 100644 --- a/src/main/java/club/joylink/rtss/controller/draft/DraftMapRouteController.java +++ b/src/main/java/club/joylink/rtss/controller/draft/DraftMapRouteController.java @@ -3,7 +3,7 @@ package club.joylink.rtss.controller.draft; import club.joylink.rtss.services.draftData.DraftMapRouteService; import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.map.MapRouteQueryVO; -import club.joylink.rtss.vo.map.MapRouteNewVO; +import club.joylink.rtss.vo.map.logic.MapRouteNewVO; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/club/joylink/rtss/controller/draft/DraftMapRunLevelController.java b/src/main/java/club/joylink/rtss/controller/draft/DraftMapRunLevelController.java index 5455b1a17..2050160ee 100644 --- a/src/main/java/club/joylink/rtss/controller/draft/DraftMapRunLevelController.java +++ b/src/main/java/club/joylink/rtss/controller/draft/DraftMapRunLevelController.java @@ -1,7 +1,7 @@ package club.joylink.rtss.controller.draft; import club.joylink.rtss.services.draftData.RunLevelService; -import club.joylink.rtss.vo.map.MapStationRunLevelVO; +import club.joylink.rtss.vo.map.logic.MapStationRunLevelVO; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/club/joylink/rtss/controller/draft/DraftMapSignalApproachSectionController.java b/src/main/java/club/joylink/rtss/controller/draft/DraftMapSignalApproachSectionController.java index 1a4733595..4f25f4a75 100644 --- a/src/main/java/club/joylink/rtss/controller/draft/DraftMapSignalApproachSectionController.java +++ b/src/main/java/club/joylink/rtss/controller/draft/DraftMapSignalApproachSectionController.java @@ -3,7 +3,7 @@ package club.joylink.rtss.controller.draft; import club.joylink.rtss.services.draftData.DraftMapSignalApproachSectionService; import club.joylink.rtss.services.draftData.SignalApproachSectionGenerator; import club.joylink.rtss.vo.client.PageVO; -import club.joylink.rtss.vo.map.MapSignalApproachSectionVO; +import club.joylink.rtss.vo.map.logic.MapSignalApproachSectionVO; import club.joylink.rtss.vo.map.query.MapSASQueryVO; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/club/joylink/rtss/controller/draft/DraftMapStationRunLevelController.java b/src/main/java/club/joylink/rtss/controller/draft/DraftMapStationRunLevelController.java index 0ec9c132b..50e11b14f 100644 --- a/src/main/java/club/joylink/rtss/controller/draft/DraftMapStationRunLevelController.java +++ b/src/main/java/club/joylink/rtss/controller/draft/DraftMapStationRunLevelController.java @@ -2,7 +2,7 @@ package club.joylink.rtss.controller.draft; import club.joylink.rtss.services.draftData.DraftMapRunLevelService; import club.joylink.rtss.vo.client.PageVO; -import club.joylink.rtss.vo.map.MapStationRunLevelVO; +import club.joylink.rtss.vo.map.logic.MapStationRunLevelVO; import club.joylink.rtss.vo.map.query.MapRunLevelQueryVO; import club.joylink.rtss.vo.map.validate.RunLevelCreateCheck; import club.joylink.rtss.vo.map.validate.RunLevelUpdateCheck; diff --git a/src/main/java/club/joylink/rtss/controller/runplan/RunPlanDraftController.java b/src/main/java/club/joylink/rtss/controller/runplan/RunPlanDraftController.java index efa5a0da0..5e595d2b6 100644 --- a/src/main/java/club/joylink/rtss/controller/runplan/RunPlanDraftController.java +++ b/src/main/java/club/joylink/rtss/controller/runplan/RunPlanDraftController.java @@ -13,7 +13,7 @@ import club.joylink.rtss.vo.client.runplan.user.RunPlanRoutingVO; import club.joylink.rtss.vo.client.validGroup.RunPlanCreateCheck; import club.joylink.rtss.vo.client.validGroup.RunPlanNameCheck; import club.joylink.rtss.vo.client.validGroup.ValidList; -import club.joylink.rtss.vo.map.MapStationRunLevelVO; +import club.joylink.rtss.vo.map.logic.MapStationRunLevelVO; import club.joylink.rtss.vo.runplan.RunPlanInputData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; diff --git a/src/main/java/club/joylink/rtss/services/DraftMapService.java b/src/main/java/club/joylink/rtss/services/DraftMapService.java index b2d2f7ba3..3b23ad3f8 100644 --- a/src/main/java/club/joylink/rtss/services/DraftMapService.java +++ b/src/main/java/club/joylink/rtss/services/DraftMapService.java @@ -16,6 +16,17 @@ import club.joylink.rtss.vo.client.TreeNode; import club.joylink.rtss.vo.client.map.*; import club.joylink.rtss.vo.map.*; import club.joylink.rtss.vo.map.graph.MapSectionNewVO; +import club.joylink.rtss.vo.map.logic.MapAutoReentryVO; +import club.joylink.rtss.vo.map.logic.MapAutoSignalNewVO; +import club.joylink.rtss.vo.map.logic.MapDestinationCodeDefinitionVO; +import club.joylink.rtss.vo.map.logic.MapOverlapVO; +import club.joylink.rtss.vo.map.logic.MapRouteFlankProtectionNewVO; +import club.joylink.rtss.vo.map.logic.MapRouteNewVO; +import club.joylink.rtss.vo.map.logic.MapRouteOverrunVO; +import club.joylink.rtss.vo.map.logic.MapRoutingDataVO; +import club.joylink.rtss.vo.map.logic.MapSignalApproachSectionVO; +import club.joylink.rtss.vo.map.logic.MapStationParkingTimeVO; +import club.joylink.rtss.vo.map.logic.MapStationRunLevelVO; import club.joylink.rtss.vo.map.query.MapAutoReentryQueryVO; import club.joylink.rtss.vo.map.query.MapDestinationCodeDefinitionQueryVO; import club.joylink.rtss.vo.map.query.MapParkTimeQueryVO; diff --git a/src/main/java/club/joylink/rtss/services/IDraftMapService.java b/src/main/java/club/joylink/rtss/services/IDraftMapService.java index 9451735e8..80efc3d35 100644 --- a/src/main/java/club/joylink/rtss/services/IDraftMapService.java +++ b/src/main/java/club/joylink/rtss/services/IDraftMapService.java @@ -6,6 +6,13 @@ import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.TreeNode; import club.joylink.rtss.vo.client.map.*; import club.joylink.rtss.vo.map.*; +import club.joylink.rtss.vo.map.logic.MapAutoReentryVO; +import club.joylink.rtss.vo.map.logic.MapAutoSignalNewVO; +import club.joylink.rtss.vo.map.logic.MapDestinationCodeDefinitionVO; +import club.joylink.rtss.vo.map.logic.MapRouteNewVO; +import club.joylink.rtss.vo.map.logic.MapRoutingDataVO; +import club.joylink.rtss.vo.map.logic.MapSignalApproachSectionVO; +import club.joylink.rtss.vo.map.logic.MapStationParkingTimeVO; import club.joylink.rtss.vo.map.query.MapAutoReentryQueryVO; import club.joylink.rtss.vo.map.query.MapDestinationCodeDefinitionQueryVO; import club.joylink.rtss.vo.map.query.MapParkTimeQueryVO; diff --git a/src/main/java/club/joylink/rtss/services/IRunPlanDraftService.java b/src/main/java/club/joylink/rtss/services/IRunPlanDraftService.java index 6c050be95..932775d84 100644 --- a/src/main/java/club/joylink/rtss/services/IRunPlanDraftService.java +++ b/src/main/java/club/joylink/rtss/services/IRunPlanDraftService.java @@ -5,7 +5,7 @@ import club.joylink.rtss.vo.LoginUserInfoVO; import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.map.MapRoutingSectionVO; import club.joylink.rtss.vo.client.runplan.*; -import club.joylink.rtss.vo.map.MapStationRunLevelVO; +import club.joylink.rtss.vo.map.logic.MapStationRunLevelVO; import club.joylink.rtss.vo.map.MapVO; import club.joylink.rtss.vo.runplan.RunPlanInputData; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/club/joylink/rtss/services/MapService.java b/src/main/java/club/joylink/rtss/services/MapService.java index f8b00206d..43f0faba9 100644 --- a/src/main/java/club/joylink/rtss/services/MapService.java +++ b/src/main/java/club/joylink/rtss/services/MapService.java @@ -38,6 +38,7 @@ import club.joylink.rtss.vo.map.graph.MapPSDVO; import club.joylink.rtss.vo.map.graph.MapSectionNewVO; import club.joylink.rtss.vo.map.graph.MapStationNewVO; import club.joylink.rtss.vo.map.graph.MapStationStandNewVO; +import club.joylink.rtss.vo.map.logic.MapRoutingDataVO; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/club/joylink/rtss/services/RunPlanDraftService.java b/src/main/java/club/joylink/rtss/services/RunPlanDraftService.java index 84eaa05f0..0c0b574f2 100644 --- a/src/main/java/club/joylink/rtss/services/RunPlanDraftService.java +++ b/src/main/java/club/joylink/rtss/services/RunPlanDraftService.java @@ -25,6 +25,8 @@ import club.joylink.rtss.vo.map.*; import club.joylink.rtss.vo.map.graph.MapSectionNewVO; import club.joylink.rtss.vo.map.graph.MapStationNewVO; import club.joylink.rtss.vo.map.graph.MapStationStandNewVO; +import club.joylink.rtss.vo.map.logic.MapRoutingDataVO; +import club.joylink.rtss.vo.map.logic.MapStationRunLevelVO; import club.joylink.rtss.vo.runplan.RunPlanInputData; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; diff --git a/src/main/java/club/joylink/rtss/services/draftData/DraftMapCiDataGeneratorImpl.java b/src/main/java/club/joylink/rtss/services/draftData/DraftMapCiDataGeneratorImpl.java index d901a9ea7..0bc56149d 100644 --- a/src/main/java/club/joylink/rtss/services/draftData/DraftMapCiDataGeneratorImpl.java +++ b/src/main/java/club/joylink/rtss/services/draftData/DraftMapCiDataGeneratorImpl.java @@ -9,6 +9,15 @@ import club.joylink.rtss.simulation.cbtc.exception.SimulationException; import club.joylink.rtss.simulation.cbtc.exception.SimulationExceptionType; import club.joylink.rtss.util.JsonUtils; import club.joylink.rtss.vo.map.*; +import club.joylink.rtss.vo.map.logic.MapAutoReentryVO; +import club.joylink.rtss.vo.map.logic.MapAutoSignalNewVO; +import club.joylink.rtss.vo.map.logic.MapDestinationCodeDefinitionVO; +import club.joylink.rtss.vo.map.logic.MapOverlapVO; +import club.joylink.rtss.vo.map.logic.MapRouteFlankProtectionNewVO; +import club.joylink.rtss.vo.map.logic.MapRouteNewVO; +import club.joylink.rtss.vo.map.logic.MapRoutingDataVO; +import club.joylink.rtss.vo.map.logic.MapSignalApproachSectionVO; +import club.joylink.rtss.vo.map.logic.MapStationRunLevelVO; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/club/joylink/rtss/services/draftData/DraftMapDataHandleServiceImpl.java b/src/main/java/club/joylink/rtss/services/draftData/DraftMapDataHandleServiceImpl.java index 3c0db8dfc..0b76fbc18 100644 --- a/src/main/java/club/joylink/rtss/services/draftData/DraftMapDataHandleServiceImpl.java +++ b/src/main/java/club/joylink/rtss/services/draftData/DraftMapDataHandleServiceImpl.java @@ -17,6 +17,8 @@ import club.joylink.rtss.vo.map.graph.MapSectionNewVO; import club.joylink.rtss.vo.map.graph.MapSignalNewVO; import club.joylink.rtss.vo.map.graph.MapStationStandNewVO; import club.joylink.rtss.vo.map.graph.MapSwitchVO; +import club.joylink.rtss.vo.map.logic.MapRouteNewVO; +import club.joylink.rtss.vo.map.logic.MapSignalApproachSectionVO; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/club/joylink/rtss/services/draftData/DraftMapFlankProtectionService.java b/src/main/java/club/joylink/rtss/services/draftData/DraftMapFlankProtectionService.java index 0285f0400..c97327d4d 100644 --- a/src/main/java/club/joylink/rtss/services/draftData/DraftMapFlankProtectionService.java +++ b/src/main/java/club/joylink/rtss/services/draftData/DraftMapFlankProtectionService.java @@ -1,7 +1,7 @@ package club.joylink.rtss.services.draftData; import club.joylink.rtss.vo.client.PageVO; -import club.joylink.rtss.vo.map.MapRouteFlankProtectionNewVO; +import club.joylink.rtss.vo.map.logic.MapRouteFlankProtectionNewVO; import club.joylink.rtss.vo.map.query.MapRouteFlankProtectionQueryVO; public interface DraftMapFlankProtectionService { diff --git a/src/main/java/club/joylink/rtss/services/draftData/DraftMapFlankProtectionServiceImpl.java b/src/main/java/club/joylink/rtss/services/draftData/DraftMapFlankProtectionServiceImpl.java index 0624bba97..a1f5e9d13 100644 --- a/src/main/java/club/joylink/rtss/services/draftData/DraftMapFlankProtectionServiceImpl.java +++ b/src/main/java/club/joylink/rtss/services/draftData/DraftMapFlankProtectionServiceImpl.java @@ -5,7 +5,7 @@ import club.joylink.rtss.entity.DraftMapRouteFlankProtection; import club.joylink.rtss.entity.DraftMapRouteFlankProtectionExample; import club.joylink.rtss.exception.BusinessExceptionAssertEnum; import club.joylink.rtss.vo.client.PageVO; -import club.joylink.rtss.vo.map.MapRouteFlankProtectionNewVO; +import club.joylink.rtss.vo.map.logic.MapRouteFlankProtectionNewVO; import club.joylink.rtss.vo.map.query.MapRouteFlankProtectionQueryVO; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; diff --git a/src/main/java/club/joylink/rtss/services/draftData/DraftMapFlsService.java b/src/main/java/club/joylink/rtss/services/draftData/DraftMapFlsService.java index 85bbca5ae..eb9d42793 100644 --- a/src/main/java/club/joylink/rtss/services/draftData/DraftMapFlsService.java +++ b/src/main/java/club/joylink/rtss/services/draftData/DraftMapFlsService.java @@ -1,7 +1,7 @@ package club.joylink.rtss.services.draftData; import club.joylink.rtss.vo.client.PageVO; -import club.joylink.rtss.vo.map.MapRouteFlankProtectionNewVO; +import club.joylink.rtss.vo.map.logic.MapRouteFlankProtectionNewVO; import club.joylink.rtss.vo.map.query.MapRouteFlankProtectionQueryVO; import java.util.List; diff --git a/src/main/java/club/joylink/rtss/services/draftData/DraftMapFlsServiceImpl.java b/src/main/java/club/joylink/rtss/services/draftData/DraftMapFlsServiceImpl.java index b3685fb62..22f29b3aa 100644 --- a/src/main/java/club/joylink/rtss/services/draftData/DraftMapFlsServiceImpl.java +++ b/src/main/java/club/joylink/rtss/services/draftData/DraftMapFlsServiceImpl.java @@ -5,7 +5,7 @@ import club.joylink.rtss.entity.DraftMapRouteFlankProtection; import club.joylink.rtss.entity.DraftMapRouteFlankProtectionExample; import club.joylink.rtss.exception.BusinessExceptionAssertEnum; import club.joylink.rtss.vo.client.PageVO; -import club.joylink.rtss.vo.map.MapRouteFlankProtectionNewVO; +import club.joylink.rtss.vo.map.logic.MapRouteFlankProtectionNewVO; import club.joylink.rtss.vo.map.query.MapRouteFlankProtectionQueryVO; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; diff --git a/src/main/java/club/joylink/rtss/services/draftData/DraftMapOverlapService.java b/src/main/java/club/joylink/rtss/services/draftData/DraftMapOverlapService.java index 48bbccf40..503d1f57d 100644 --- a/src/main/java/club/joylink/rtss/services/draftData/DraftMapOverlapService.java +++ b/src/main/java/club/joylink/rtss/services/draftData/DraftMapOverlapService.java @@ -1,7 +1,7 @@ package club.joylink.rtss.services.draftData; import club.joylink.rtss.vo.client.PageVO; -import club.joylink.rtss.vo.map.MapOverlapVO; +import club.joylink.rtss.vo.map.logic.MapOverlapVO; import club.joylink.rtss.vo.map.query.MapOverlapQueryVO; import java.util.List; diff --git a/src/main/java/club/joylink/rtss/services/draftData/DraftMapOverlapServiceImpl.java b/src/main/java/club/joylink/rtss/services/draftData/DraftMapOverlapServiceImpl.java index 389c4953f..c28570fcf 100644 --- a/src/main/java/club/joylink/rtss/services/draftData/DraftMapOverlapServiceImpl.java +++ b/src/main/java/club/joylink/rtss/services/draftData/DraftMapOverlapServiceImpl.java @@ -5,7 +5,7 @@ import club.joylink.rtss.entity.DraftMapOverlap; import club.joylink.rtss.entity.DraftMapOverlapExample; import club.joylink.rtss.exception.BusinessExceptionAssertEnum; import club.joylink.rtss.vo.client.PageVO; -import club.joylink.rtss.vo.map.MapOverlapVO; +import club.joylink.rtss.vo.map.logic.MapOverlapVO; import club.joylink.rtss.vo.map.query.MapOverlapQueryVO; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; diff --git a/src/main/java/club/joylink/rtss/services/draftData/DraftMapOverrunService.java b/src/main/java/club/joylink/rtss/services/draftData/DraftMapOverrunService.java index 88689f053..1ab048e94 100644 --- a/src/main/java/club/joylink/rtss/services/draftData/DraftMapOverrunService.java +++ b/src/main/java/club/joylink/rtss/services/draftData/DraftMapOverrunService.java @@ -2,7 +2,7 @@ package club.joylink.rtss.services.draftData; import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.map.MapRouteOverrunQueryVO; -import club.joylink.rtss.vo.map.MapRouteOverrunVO; +import club.joylink.rtss.vo.map.logic.MapRouteOverrunVO; import java.util.List; diff --git a/src/main/java/club/joylink/rtss/services/draftData/DraftMapOverrunServiceImpl.java b/src/main/java/club/joylink/rtss/services/draftData/DraftMapOverrunServiceImpl.java index adb74d387..8117cb8d4 100644 --- a/src/main/java/club/joylink/rtss/services/draftData/DraftMapOverrunServiceImpl.java +++ b/src/main/java/club/joylink/rtss/services/draftData/DraftMapOverrunServiceImpl.java @@ -6,7 +6,7 @@ import club.joylink.rtss.entity.DraftMapRouteOverrunExample; import club.joylink.rtss.exception.BusinessExceptionAssertEnum; import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.map.MapRouteOverrunQueryVO; -import club.joylink.rtss.vo.map.MapRouteOverrunVO; +import club.joylink.rtss.vo.map.logic.MapRouteOverrunVO; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/club/joylink/rtss/services/draftData/DraftMapRouteService.java b/src/main/java/club/joylink/rtss/services/draftData/DraftMapRouteService.java index 4c12848ef..a9ba94e1d 100644 --- a/src/main/java/club/joylink/rtss/services/draftData/DraftMapRouteService.java +++ b/src/main/java/club/joylink/rtss/services/draftData/DraftMapRouteService.java @@ -2,7 +2,7 @@ package club.joylink.rtss.services.draftData; import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.map.MapRouteQueryVO; -import club.joylink.rtss.vo.map.MapRouteNewVO; +import club.joylink.rtss.vo.map.logic.MapRouteNewVO; import java.util.List; diff --git a/src/main/java/club/joylink/rtss/services/draftData/DraftMapRouteServiceImpl.java b/src/main/java/club/joylink/rtss/services/draftData/DraftMapRouteServiceImpl.java index 263c090e8..5da21b3e5 100644 --- a/src/main/java/club/joylink/rtss/services/draftData/DraftMapRouteServiceImpl.java +++ b/src/main/java/club/joylink/rtss/services/draftData/DraftMapRouteServiceImpl.java @@ -10,7 +10,7 @@ import club.joylink.rtss.simulation.rt.repo.CommonRepositoryBuilder; import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.map.MapRouteQueryVO; import club.joylink.rtss.vo.map.MapGraphDataNewVO; -import club.joylink.rtss.vo.map.MapRouteNewVO; +import club.joylink.rtss.vo.map.logic.MapRouteNewVO; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/club/joylink/rtss/services/draftData/DraftMapRunLevelService.java b/src/main/java/club/joylink/rtss/services/draftData/DraftMapRunLevelService.java index ffb582736..d38fcd30c 100644 --- a/src/main/java/club/joylink/rtss/services/draftData/DraftMapRunLevelService.java +++ b/src/main/java/club/joylink/rtss/services/draftData/DraftMapRunLevelService.java @@ -1,7 +1,7 @@ package club.joylink.rtss.services.draftData; import club.joylink.rtss.vo.client.PageVO; -import club.joylink.rtss.vo.map.MapStationRunLevelVO; +import club.joylink.rtss.vo.map.logic.MapStationRunLevelVO; import club.joylink.rtss.vo.map.query.MapRunLevelQueryVO; public interface DraftMapRunLevelService { diff --git a/src/main/java/club/joylink/rtss/services/draftData/DraftMapRunLevelServiceImpl.java b/src/main/java/club/joylink/rtss/services/draftData/DraftMapRunLevelServiceImpl.java index 16846304c..ad8e09755 100644 --- a/src/main/java/club/joylink/rtss/services/draftData/DraftMapRunLevelServiceImpl.java +++ b/src/main/java/club/joylink/rtss/services/draftData/DraftMapRunLevelServiceImpl.java @@ -11,8 +11,8 @@ import club.joylink.rtss.simulation.cbtc.data.map.MapElement; import club.joylink.rtss.simulation.cbtc.data.map.Section; import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.map.MapDataVO; -import club.joylink.rtss.vo.map.MapRoutingDataVO; -import club.joylink.rtss.vo.map.MapStationRunLevelVO; +import club.joylink.rtss.vo.map.logic.MapRoutingDataVO; +import club.joylink.rtss.vo.map.logic.MapStationRunLevelVO; import club.joylink.rtss.vo.map.MapVO; import club.joylink.rtss.vo.map.query.MapRunLevelQueryVO; import com.github.pagehelper.Page; diff --git a/src/main/java/club/joylink/rtss/services/draftData/DraftMapService.java b/src/main/java/club/joylink/rtss/services/draftData/DraftMapService.java index c149e7a10..3ee8e842f 100644 --- a/src/main/java/club/joylink/rtss/services/draftData/DraftMapService.java +++ b/src/main/java/club/joylink/rtss/services/draftData/DraftMapService.java @@ -1,6 +1,16 @@ package club.joylink.rtss.services.draftData; import club.joylink.rtss.vo.map.*; +import club.joylink.rtss.vo.map.logic.MapAutoReentryVO; +import club.joylink.rtss.vo.map.logic.MapAutoSignalNewVO; +import club.joylink.rtss.vo.map.logic.MapDestinationCodeDefinitionVO; +import club.joylink.rtss.vo.map.logic.MapOverlapVO; +import club.joylink.rtss.vo.map.logic.MapRouteFlankProtectionNewVO; +import club.joylink.rtss.vo.map.logic.MapRouteNewVO; +import club.joylink.rtss.vo.map.logic.MapRoutingDataVO; +import club.joylink.rtss.vo.map.logic.MapSignalApproachSectionVO; +import club.joylink.rtss.vo.map.logic.MapStationParkingTimeVO; +import club.joylink.rtss.vo.map.logic.MapStationRunLevelVO; import java.util.List; diff --git a/src/main/java/club/joylink/rtss/services/draftData/DraftMapServiceImpl.java b/src/main/java/club/joylink/rtss/services/draftData/DraftMapServiceImpl.java index 1a8de662b..1a9c6e6c3 100644 --- a/src/main/java/club/joylink/rtss/services/draftData/DraftMapServiceImpl.java +++ b/src/main/java/club/joylink/rtss/services/draftData/DraftMapServiceImpl.java @@ -4,6 +4,16 @@ import club.joylink.rtss.dao.*; import club.joylink.rtss.entity.*; import club.joylink.rtss.util.JsonUtils; import club.joylink.rtss.vo.map.*; +import club.joylink.rtss.vo.map.logic.MapAutoReentryVO; +import club.joylink.rtss.vo.map.logic.MapAutoSignalNewVO; +import club.joylink.rtss.vo.map.logic.MapDestinationCodeDefinitionVO; +import club.joylink.rtss.vo.map.logic.MapOverlapVO; +import club.joylink.rtss.vo.map.logic.MapRouteFlankProtectionNewVO; +import club.joylink.rtss.vo.map.logic.MapRouteNewVO; +import club.joylink.rtss.vo.map.logic.MapRoutingDataVO; +import club.joylink.rtss.vo.map.logic.MapSignalApproachSectionVO; +import club.joylink.rtss.vo.map.logic.MapStationParkingTimeVO; +import club.joylink.rtss.vo.map.logic.MapStationRunLevelVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/club/joylink/rtss/services/draftData/DraftMapSignalApproachSectionService.java b/src/main/java/club/joylink/rtss/services/draftData/DraftMapSignalApproachSectionService.java index 24a22e2b1..8b03fcce4 100644 --- a/src/main/java/club/joylink/rtss/services/draftData/DraftMapSignalApproachSectionService.java +++ b/src/main/java/club/joylink/rtss/services/draftData/DraftMapSignalApproachSectionService.java @@ -1,7 +1,7 @@ package club.joylink.rtss.services.draftData; import club.joylink.rtss.vo.client.PageVO; -import club.joylink.rtss.vo.map.MapSignalApproachSectionVO; +import club.joylink.rtss.vo.map.logic.MapSignalApproachSectionVO; import club.joylink.rtss.vo.map.query.MapSASQueryVO; import java.util.List; diff --git a/src/main/java/club/joylink/rtss/services/draftData/DraftMapSignalApproachSectionServiceImpl.java b/src/main/java/club/joylink/rtss/services/draftData/DraftMapSignalApproachSectionServiceImpl.java index 9fb667928..bc1900036 100644 --- a/src/main/java/club/joylink/rtss/services/draftData/DraftMapSignalApproachSectionServiceImpl.java +++ b/src/main/java/club/joylink/rtss/services/draftData/DraftMapSignalApproachSectionServiceImpl.java @@ -7,7 +7,7 @@ import club.joylink.rtss.exception.BusinessExceptionAssertEnum; import club.joylink.rtss.simulation.rt.repo.CommonRepository; import club.joylink.rtss.simulation.rt.repo.CommonRepositoryBuilder; import club.joylink.rtss.vo.client.PageVO; -import club.joylink.rtss.vo.map.MapSignalApproachSectionVO; +import club.joylink.rtss.vo.map.logic.MapSignalApproachSectionVO; import club.joylink.rtss.vo.map.MapVO; import club.joylink.rtss.vo.map.query.MapSASQueryVO; import com.github.pagehelper.Page; diff --git a/src/main/java/club/joylink/rtss/services/draftData/ParkTimeService.java b/src/main/java/club/joylink/rtss/services/draftData/ParkTimeService.java index d5378ff8b..d51593c82 100644 --- a/src/main/java/club/joylink/rtss/services/draftData/ParkTimeService.java +++ b/src/main/java/club/joylink/rtss/services/draftData/ParkTimeService.java @@ -7,7 +7,7 @@ import club.joylink.rtss.simulation.cbtc.build.SimulationBuilder; import club.joylink.rtss.simulation.cbtc.data.map.MapElement; import club.joylink.rtss.simulation.cbtc.data.map.Section; import club.joylink.rtss.util.JsonUtils; -import club.joylink.rtss.vo.map.MapStationParkingTimeVO; +import club.joylink.rtss.vo.map.logic.MapStationParkingTimeVO; import club.joylink.rtss.vo.map.MapVO; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/club/joylink/rtss/services/draftData/RailwayRouteGenerator.java b/src/main/java/club/joylink/rtss/services/draftData/RailwayRouteGenerator.java index e0306a6ce..33aab59b0 100644 --- a/src/main/java/club/joylink/rtss/services/draftData/RailwayRouteGenerator.java +++ b/src/main/java/club/joylink/rtss/services/draftData/RailwayRouteGenerator.java @@ -3,7 +3,7 @@ package club.joylink.rtss.services.draftData; import club.joylink.rtss.exception.BusinessExceptionAssertEnum; import club.joylink.rtss.simulation.rt.repo.*; import club.joylink.rtss.vo.map.MapCISwitchVO; -import club.joylink.rtss.vo.map.MapRouteNewVO; +import club.joylink.rtss.vo.map.logic.MapRouteNewVO; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/club/joylink/rtss/services/draftData/RoutingGenerator.java b/src/main/java/club/joylink/rtss/services/draftData/RoutingGenerator.java index e23dbac37..6ae75199d 100644 --- a/src/main/java/club/joylink/rtss/services/draftData/RoutingGenerator.java +++ b/src/main/java/club/joylink/rtss/services/draftData/RoutingGenerator.java @@ -1,7 +1,7 @@ package club.joylink.rtss.services.draftData; import club.joylink.rtss.simulation.cbtc.data.map.*; -import club.joylink.rtss.vo.map.MapRoutingDataVO; +import club.joylink.rtss.vo.map.logic.MapRoutingDataVO; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; diff --git a/src/main/java/club/joylink/rtss/services/draftData/RunLevelService.java b/src/main/java/club/joylink/rtss/services/draftData/RunLevelService.java index 25fa15ffe..ab97bc5f4 100644 --- a/src/main/java/club/joylink/rtss/services/draftData/RunLevelService.java +++ b/src/main/java/club/joylink/rtss/services/draftData/RunLevelService.java @@ -9,9 +9,9 @@ import club.joylink.rtss.simulation.cbtc.data.map.MapElement; import club.joylink.rtss.simulation.cbtc.data.map.Section; import club.joylink.rtss.simulation.cbtc.data.support.RoutePath; import club.joylink.rtss.util.JsonUtils; -import club.joylink.rtss.vo.map.MapRoutingDataVO; +import club.joylink.rtss.vo.map.logic.MapRoutingDataVO; import club.joylink.rtss.vo.map.MapRoutingSectionNewVO; -import club.joylink.rtss.vo.map.MapStationRunLevelVO; +import club.joylink.rtss.vo.map.logic.MapStationRunLevelVO; import club.joylink.rtss.vo.map.MapVO; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/club/joylink/rtss/services/draftData/SignalApproachSectionGenerator.java b/src/main/java/club/joylink/rtss/services/draftData/SignalApproachSectionGenerator.java index d632ee18e..18777fc78 100644 --- a/src/main/java/club/joylink/rtss/services/draftData/SignalApproachSectionGenerator.java +++ b/src/main/java/club/joylink/rtss/services/draftData/SignalApproachSectionGenerator.java @@ -2,7 +2,7 @@ package club.joylink.rtss.services.draftData; import club.joylink.rtss.simulation.rt.repo.*; import club.joylink.rtss.vo.map.MapSectionPathVO; -import club.joylink.rtss.vo.map.MapSignalApproachSectionVO; +import club.joylink.rtss.vo.map.logic.MapSignalApproachSectionVO; import lombok.Getter; import lombok.Setter; import org.springframework.stereotype.Component; diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/build/InterlockBuilder2.java b/src/main/java/club/joylink/rtss/simulation/cbtc/build/InterlockBuilder2.java index 96d04c255..15c16c70f 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/build/InterlockBuilder2.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/build/InterlockBuilder2.java @@ -6,8 +6,18 @@ import club.joylink.rtss.simulation.cbtc.data.CalculateService; import club.joylink.rtss.simulation.cbtc.data.map.*; import club.joylink.rtss.simulation.cbtc.data.support.RoutePath; import club.joylink.rtss.simulation.cbtc.data.support.RouteUnit; -import club.joylink.rtss.simulation.rt.CIL.bo.CilSwitch; import club.joylink.rtss.vo.map.*; +import club.joylink.rtss.vo.map.logic.MapAutoReentryVO; +import club.joylink.rtss.vo.map.logic.MapAutoSignalNewVO; +import club.joylink.rtss.vo.map.logic.MapDestinationCodeDefinitionVO; +import club.joylink.rtss.vo.map.logic.MapOverlapVO; +import club.joylink.rtss.vo.map.logic.MapRouteFlankProtectionNewVO; +import club.joylink.rtss.vo.map.logic.MapRouteNewVO; +import club.joylink.rtss.vo.map.logic.MapRouteOverrunVO; +import club.joylink.rtss.vo.map.logic.MapRoutingDataVO; +import club.joylink.rtss.vo.map.logic.MapSignalApproachSectionVO; +import club.joylink.rtss.vo.map.logic.MapStationParkingTimeVO; +import club.joylink.rtss.vo.map.logic.MapStationRunLevelVO; import lombok.extern.slf4j.Slf4j; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/build/SimulationBuilder.java b/src/main/java/club/joylink/rtss/simulation/cbtc/build/SimulationBuilder.java index 93fe8eabe..2f49c9a10 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/build/SimulationBuilder.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/build/SimulationBuilder.java @@ -10,7 +10,7 @@ import club.joylink.rtss.simulation.cbtc.data.support.RoutePath; import club.joylink.rtss.simulation.cbtc.data.vr.VirtualRealityDevice; import club.joylink.rtss.vo.client.runplan.RunPlanVO; import club.joylink.rtss.vo.client.schedulingNew.SchedulingPlanNewVO; -import club.joylink.rtss.vo.map.MapStationParkingTimeVO; +import club.joylink.rtss.vo.map.logic.MapStationParkingTimeVO; import club.joylink.rtss.vo.map.MapVO; import club.joylink.rtss.vo.map.RealLineConfigVO; import lombok.Getter; diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/build/UserConfigDataBuilder.java b/src/main/java/club/joylink/rtss/simulation/cbtc/build/UserConfigDataBuilder.java index 8ab0f91ca..6d562693f 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/build/UserConfigDataBuilder.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/build/UserConfigDataBuilder.java @@ -7,8 +7,8 @@ import club.joylink.rtss.simulation.cbtc.data.map.StationParkTime; import club.joylink.rtss.simulation.cbtc.data.map.StationRunLevel; import club.joylink.rtss.vo.client.runplan.user.RunPlanParkingTimeVO; import club.joylink.rtss.vo.client.runplan.user.RunPlanRunlevelVO; -import club.joylink.rtss.vo.map.MapStationParkingTimeVO; -import club.joylink.rtss.vo.map.MapStationRunLevelVO; +import club.joylink.rtss.vo.map.logic.MapStationParkingTimeVO; +import club.joylink.rtss.vo.map.logic.MapStationRunLevelVO; import club.joylink.rtss.vo.map.MapVO; import org.springframework.util.CollectionUtils; diff --git a/src/main/java/club/joylink/rtss/simulation/rt/ATS/bo/AtsRepositoryBuilder.java b/src/main/java/club/joylink/rtss/simulation/rt/ATS/bo/AtsRepositoryBuilder.java index 60c3e91b8..7822152ec 100644 --- a/src/main/java/club/joylink/rtss/simulation/rt/ATS/bo/AtsRepositoryBuilder.java +++ b/src/main/java/club/joylink/rtss/simulation/rt/ATS/bo/AtsRepositoryBuilder.java @@ -5,6 +5,7 @@ import club.joylink.rtss.vo.map.*; import club.joylink.rtss.vo.map.graph.MapSectionNewVO; import club.joylink.rtss.vo.map.graph.MapSignalNewVO; import club.joylink.rtss.vo.map.graph.MapSwitchVO; +import club.joylink.rtss.vo.map.logic.MapRouteNewVO; import java.util.List; import java.util.Map; diff --git a/src/main/java/club/joylink/rtss/simulation/rt/CIL/bo/CilRepositoryBuilder.java b/src/main/java/club/joylink/rtss/simulation/rt/CIL/bo/CilRepositoryBuilder.java index c62c1b8d7..e1a31c69a 100644 --- a/src/main/java/club/joylink/rtss/simulation/rt/CIL/bo/CilRepositoryBuilder.java +++ b/src/main/java/club/joylink/rtss/simulation/rt/CIL/bo/CilRepositoryBuilder.java @@ -8,6 +8,10 @@ import club.joylink.rtss.vo.map.graph.MapSectionNewVO; import club.joylink.rtss.vo.map.graph.MapSignalNewVO; import club.joylink.rtss.vo.map.graph.MapStationStandNewVO; import club.joylink.rtss.vo.map.graph.MapSwitchVO; +import club.joylink.rtss.vo.map.logic.MapAutoSignalNewVO; +import club.joylink.rtss.vo.map.logic.MapOverlapVO; +import club.joylink.rtss.vo.map.logic.MapRouteFlankProtectionNewVO; +import club.joylink.rtss.vo.map.logic.MapRouteNewVO; import org.springframework.util.CollectionUtils; import java.util.ArrayList; diff --git a/src/main/java/club/joylink/rtss/simulation/rt/repo/CommonRepositoryBuilder.java b/src/main/java/club/joylink/rtss/simulation/rt/repo/CommonRepositoryBuilder.java index 5e820f6f3..22e41713d 100644 --- a/src/main/java/club/joylink/rtss/simulation/rt/repo/CommonRepositoryBuilder.java +++ b/src/main/java/club/joylink/rtss/simulation/rt/repo/CommonRepositoryBuilder.java @@ -8,6 +8,10 @@ import club.joylink.rtss.vo.map.graph.MapSignalNewVO; import club.joylink.rtss.vo.map.graph.MapStationNewVO; import club.joylink.rtss.vo.map.graph.MapStationStandNewVO; import club.joylink.rtss.vo.map.graph.MapSwitchVO; +import club.joylink.rtss.vo.map.logic.MapOverlapVO; +import club.joylink.rtss.vo.map.logic.MapRouteFlankProtectionNewVO; +import club.joylink.rtss.vo.map.logic.MapRouteNewVO; +import club.joylink.rtss.vo.map.logic.MapSignalApproachSectionVO; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; diff --git a/src/main/java/club/joylink/rtss/vo/client/runplan/user/RunPlanParkingTimeVO.java b/src/main/java/club/joylink/rtss/vo/client/runplan/user/RunPlanParkingTimeVO.java index da3de2812..aa40a94f3 100644 --- a/src/main/java/club/joylink/rtss/vo/client/runplan/user/RunPlanParkingTimeVO.java +++ b/src/main/java/club/joylink/rtss/vo/client/runplan/user/RunPlanParkingTimeVO.java @@ -1,7 +1,7 @@ package club.joylink.rtss.vo.client.runplan.user; import club.joylink.rtss.entity.RunPlanParktime; -import club.joylink.rtss.vo.map.MapStationParkingTimeVO; +import club.joylink.rtss.vo.map.logic.MapStationParkingTimeVO; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/club/joylink/rtss/vo/client/runplan/user/RunPlanRoutingVO.java b/src/main/java/club/joylink/rtss/vo/client/runplan/user/RunPlanRoutingVO.java index 0f9108a41..a41cb5b8a 100644 --- a/src/main/java/club/joylink/rtss/vo/client/runplan/user/RunPlanRoutingVO.java +++ b/src/main/java/club/joylink/rtss/vo/client/runplan/user/RunPlanRoutingVO.java @@ -2,7 +2,7 @@ package club.joylink.rtss.vo.client.runplan.user; import club.joylink.rtss.entity.RunPlanRouting; import club.joylink.rtss.util.JsonUtils; -import club.joylink.rtss.vo.map.MapRoutingDataVO; +import club.joylink.rtss.vo.map.logic.MapRoutingDataVO; import club.joylink.rtss.vo.map.graph.MapSectionNewVO; import club.joylink.rtss.vo.map.MapVO; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/src/main/java/club/joylink/rtss/vo/client/runplan/user/RunPlanRunlevelVO.java b/src/main/java/club/joylink/rtss/vo/client/runplan/user/RunPlanRunlevelVO.java index 7907b2d2d..47959a752 100644 --- a/src/main/java/club/joylink/rtss/vo/client/runplan/user/RunPlanRunlevelVO.java +++ b/src/main/java/club/joylink/rtss/vo/client/runplan/user/RunPlanRunlevelVO.java @@ -1,7 +1,7 @@ package club.joylink.rtss.vo.client.runplan.user; import club.joylink.rtss.entity.RunPlanRunlevel; -import club.joylink.rtss.vo.map.MapStationRunLevelVO; +import club.joylink.rtss.vo.map.logic.MapStationRunLevelVO; import club.joylink.rtss.vo.map.validate.RunLevelCreateCheck; import club.joylink.rtss.vo.map.validate.RunLevelGenerateCheck; import club.joylink.rtss.vo.map.validate.RunLevelUpdateCheck; diff --git a/src/main/java/club/joylink/rtss/vo/map/MapLogicDataNewVO.java b/src/main/java/club/joylink/rtss/vo/map/MapLogicDataNewVO.java index 758d04f8b..3a9cd7506 100644 --- a/src/main/java/club/joylink/rtss/vo/map/MapLogicDataNewVO.java +++ b/src/main/java/club/joylink/rtss/vo/map/MapLogicDataNewVO.java @@ -1,6 +1,17 @@ package club.joylink.rtss.vo.map; import club.joylink.rtss.exception.BusinessExceptionAssertEnum; +import club.joylink.rtss.vo.map.logic.MapAutoReentryVO; +import club.joylink.rtss.vo.map.logic.MapAutoSignalNewVO; +import club.joylink.rtss.vo.map.logic.MapDestinationCodeDefinitionVO; +import club.joylink.rtss.vo.map.logic.MapOverlapVO; +import club.joylink.rtss.vo.map.logic.MapRouteFlankProtectionNewVO; +import club.joylink.rtss.vo.map.logic.MapRouteNewVO; +import club.joylink.rtss.vo.map.logic.MapRouteOverrunVO; +import club.joylink.rtss.vo.map.logic.MapRoutingDataVO; +import club.joylink.rtss.vo.map.logic.MapSignalApproachSectionVO; +import club.joylink.rtss.vo.map.logic.MapStationParkingTimeVO; +import club.joylink.rtss.vo.map.logic.MapStationRunLevelVO; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/club/joylink/rtss/vo/map/MapVO.java b/src/main/java/club/joylink/rtss/vo/map/MapVO.java index 35803896c..58c78ecc4 100644 --- a/src/main/java/club/joylink/rtss/vo/map/MapVO.java +++ b/src/main/java/club/joylink/rtss/vo/map/MapVO.java @@ -8,6 +8,8 @@ import club.joylink.rtss.vo.client.map.MapDataVO; import club.joylink.rtss.vo.map.graph.MapSectionNewVO; import club.joylink.rtss.vo.map.graph.MapStationNewVO; import club.joylink.rtss.vo.map.graph.MapStationStandNewVO; +import club.joylink.rtss.vo.map.logic.MapRoutingDataVO; +import club.joylink.rtss.vo.map.logic.MapStationRunLevelVO; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/src/main/java/club/joylink/rtss/vo/map/MapAutoReentryVO.java b/src/main/java/club/joylink/rtss/vo/map/logic/MapAutoReentryVO.java similarity index 98% rename from src/main/java/club/joylink/rtss/vo/map/MapAutoReentryVO.java rename to src/main/java/club/joylink/rtss/vo/map/logic/MapAutoReentryVO.java index e1b94bf3e..05220f4b8 100644 --- a/src/main/java/club/joylink/rtss/vo/map/MapAutoReentryVO.java +++ b/src/main/java/club/joylink/rtss/vo/map/logic/MapAutoReentryVO.java @@ -1,4 +1,4 @@ -package club.joylink.rtss.vo.map; +package club.joylink.rtss.vo.map.logic; import club.joylink.rtss.entity.DraftMapAutoReentry; import club.joylink.rtss.simulation.cbtc.data.map.Cycle; diff --git a/src/main/java/club/joylink/rtss/vo/map/MapAutoSignalNewVO.java b/src/main/java/club/joylink/rtss/vo/map/logic/MapAutoSignalNewVO.java similarity index 98% rename from src/main/java/club/joylink/rtss/vo/map/MapAutoSignalNewVO.java rename to src/main/java/club/joylink/rtss/vo/map/logic/MapAutoSignalNewVO.java index a32ad5603..f28d1517c 100644 --- a/src/main/java/club/joylink/rtss/vo/map/MapAutoSignalNewVO.java +++ b/src/main/java/club/joylink/rtss/vo/map/logic/MapAutoSignalNewVO.java @@ -1,4 +1,4 @@ -package club.joylink.rtss.vo.map; +package club.joylink.rtss.vo.map.logic; import club.joylink.rtss.entity.DraftMapAutoSignal; import club.joylink.rtss.simulation.cbtc.data.map.*; diff --git a/src/main/java/club/joylink/rtss/vo/map/MapDestinationCodeDefinitionVO.java b/src/main/java/club/joylink/rtss/vo/map/logic/MapDestinationCodeDefinitionVO.java similarity index 98% rename from src/main/java/club/joylink/rtss/vo/map/MapDestinationCodeDefinitionVO.java rename to src/main/java/club/joylink/rtss/vo/map/logic/MapDestinationCodeDefinitionVO.java index 3662c6db0..02db822e0 100644 --- a/src/main/java/club/joylink/rtss/vo/map/MapDestinationCodeDefinitionVO.java +++ b/src/main/java/club/joylink/rtss/vo/map/logic/MapDestinationCodeDefinitionVO.java @@ -1,4 +1,4 @@ -package club.joylink.rtss.vo.map; +package club.joylink.rtss.vo.map.logic; import club.joylink.rtss.simulation.cbtc.data.map.DestinationCodeDefinition; import club.joylink.rtss.simulation.cbtc.data.map.MapElement; diff --git a/src/main/java/club/joylink/rtss/vo/map/MapOverlapVO.java b/src/main/java/club/joylink/rtss/vo/map/logic/MapOverlapVO.java similarity index 97% rename from src/main/java/club/joylink/rtss/vo/map/MapOverlapVO.java rename to src/main/java/club/joylink/rtss/vo/map/logic/MapOverlapVO.java index 6d3002b74..3dcb552ad 100644 --- a/src/main/java/club/joylink/rtss/vo/map/MapOverlapVO.java +++ b/src/main/java/club/joylink/rtss/vo/map/logic/MapOverlapVO.java @@ -1,8 +1,9 @@ -package club.joylink.rtss.vo.map; +package club.joylink.rtss.vo.map.logic; import club.joylink.rtss.entity.DraftMapOverlap; import club.joylink.rtss.simulation.cbtc.data.map.RouteOverlap; import club.joylink.rtss.util.JsonUtils; +import club.joylink.rtss.vo.map.MapSectionPathVO; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/src/main/java/club/joylink/rtss/vo/map/MapRouteFlankProtectionNewVO.java b/src/main/java/club/joylink/rtss/vo/map/logic/MapRouteFlankProtectionNewVO.java similarity index 98% rename from src/main/java/club/joylink/rtss/vo/map/MapRouteFlankProtectionNewVO.java rename to src/main/java/club/joylink/rtss/vo/map/logic/MapRouteFlankProtectionNewVO.java index 85c7d502b..0eb573f97 100644 --- a/src/main/java/club/joylink/rtss/vo/map/MapRouteFlankProtectionNewVO.java +++ b/src/main/java/club/joylink/rtss/vo/map/logic/MapRouteFlankProtectionNewVO.java @@ -1,10 +1,11 @@ -package club.joylink.rtss.vo.map; +package club.joylink.rtss.vo.map.logic; import club.joylink.rtss.entity.DraftMapRouteFlankProtection; import club.joylink.rtss.simulation.cbtc.data.map.RouteFls; import club.joylink.rtss.simulation.cbtc.data.map.Signal; import club.joylink.rtss.simulation.cbtc.data.map.SwitchElement; import club.joylink.rtss.util.JsonUtils; +import club.joylink.rtss.vo.map.MapCISwitchVO; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/src/main/java/club/joylink/rtss/vo/map/MapRouteNewVO.java b/src/main/java/club/joylink/rtss/vo/map/logic/MapRouteNewVO.java similarity index 98% rename from src/main/java/club/joylink/rtss/vo/map/MapRouteNewVO.java rename to src/main/java/club/joylink/rtss/vo/map/logic/MapRouteNewVO.java index 332a4e4c6..20c8b2869 100644 --- a/src/main/java/club/joylink/rtss/vo/map/MapRouteNewVO.java +++ b/src/main/java/club/joylink/rtss/vo/map/logic/MapRouteNewVO.java @@ -1,8 +1,10 @@ -package club.joylink.rtss.vo.map; +package club.joylink.rtss.vo.map.logic; import club.joylink.rtss.entity.DraftMapRoute; import club.joylink.rtss.simulation.cbtc.data.map.*; import club.joylink.rtss.util.JsonUtils; +import club.joylink.rtss.vo.map.MapCISwitchVO; +import club.joylink.rtss.vo.map.MapRouteAspectVO; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Getter; diff --git a/src/main/java/club/joylink/rtss/vo/map/MapRouteOverrunVO.java b/src/main/java/club/joylink/rtss/vo/map/logic/MapRouteOverrunVO.java similarity index 94% rename from src/main/java/club/joylink/rtss/vo/map/MapRouteOverrunVO.java rename to src/main/java/club/joylink/rtss/vo/map/logic/MapRouteOverrunVO.java index dd341905e..e2c412f5e 100644 --- a/src/main/java/club/joylink/rtss/vo/map/MapRouteOverrunVO.java +++ b/src/main/java/club/joylink/rtss/vo/map/logic/MapRouteOverrunVO.java @@ -1,8 +1,8 @@ -package club.joylink.rtss.vo.map; +package club.joylink.rtss.vo.map.logic; import club.joylink.rtss.entity.DraftMapRouteOverrun; -import club.joylink.rtss.simulation.cbtc.data.map.SwitchElement; import club.joylink.rtss.util.JsonUtils; +import club.joylink.rtss.vo.map.MapCISwitchVO; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/club/joylink/rtss/vo/map/MapRoutingDataVO.java b/src/main/java/club/joylink/rtss/vo/map/logic/MapRoutingDataVO.java similarity index 98% rename from src/main/java/club/joylink/rtss/vo/map/MapRoutingDataVO.java rename to src/main/java/club/joylink/rtss/vo/map/logic/MapRoutingDataVO.java index 287c6e643..e411e65be 100644 --- a/src/main/java/club/joylink/rtss/vo/map/MapRoutingDataVO.java +++ b/src/main/java/club/joylink/rtss/vo/map/logic/MapRoutingDataVO.java @@ -1,8 +1,9 @@ -package club.joylink.rtss.vo.map; +package club.joylink.rtss.vo.map.logic; import club.joylink.rtss.entity.DraftMapRouting; import club.joylink.rtss.simulation.cbtc.data.map.Routing; import club.joylink.rtss.util.JsonUtils; +import club.joylink.rtss.vo.map.MapRoutingSectionNewVO; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/club/joylink/rtss/vo/map/MapSignalApproachSectionVO.java b/src/main/java/club/joylink/rtss/vo/map/logic/MapSignalApproachSectionVO.java similarity index 97% rename from src/main/java/club/joylink/rtss/vo/map/MapSignalApproachSectionVO.java rename to src/main/java/club/joylink/rtss/vo/map/logic/MapSignalApproachSectionVO.java index 0e829e437..f797202fe 100644 --- a/src/main/java/club/joylink/rtss/vo/map/MapSignalApproachSectionVO.java +++ b/src/main/java/club/joylink/rtss/vo/map/logic/MapSignalApproachSectionVO.java @@ -1,8 +1,9 @@ -package club.joylink.rtss.vo.map; +package club.joylink.rtss.vo.map.logic; import club.joylink.rtss.entity.DraftMapSignalApproachSection; import club.joylink.rtss.simulation.cbtc.data.map.Signal; import club.joylink.rtss.util.JsonUtils; +import club.joylink.rtss.vo.map.MapSectionPathVO; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/src/main/java/club/joylink/rtss/vo/map/MapStationParkingTimeVO.java b/src/main/java/club/joylink/rtss/vo/map/logic/MapStationParkingTimeVO.java similarity index 98% rename from src/main/java/club/joylink/rtss/vo/map/MapStationParkingTimeVO.java rename to src/main/java/club/joylink/rtss/vo/map/logic/MapStationParkingTimeVO.java index 38142f9d6..0b6f58c32 100644 --- a/src/main/java/club/joylink/rtss/vo/map/MapStationParkingTimeVO.java +++ b/src/main/java/club/joylink/rtss/vo/map/logic/MapStationParkingTimeVO.java @@ -1,4 +1,4 @@ -package club.joylink.rtss.vo.map; +package club.joylink.rtss.vo.map.logic; import club.joylink.rtss.entity.DraftMapParkingTime; import lombok.Getter; diff --git a/src/main/java/club/joylink/rtss/vo/map/MapStationRunLevelVO.java b/src/main/java/club/joylink/rtss/vo/map/logic/MapStationRunLevelVO.java similarity index 98% rename from src/main/java/club/joylink/rtss/vo/map/MapStationRunLevelVO.java rename to src/main/java/club/joylink/rtss/vo/map/logic/MapStationRunLevelVO.java index aca7c4511..e95087582 100644 --- a/src/main/java/club/joylink/rtss/vo/map/MapStationRunLevelVO.java +++ b/src/main/java/club/joylink/rtss/vo/map/logic/MapStationRunLevelVO.java @@ -1,8 +1,9 @@ -package club.joylink.rtss.vo.map; +package club.joylink.rtss.vo.map.logic; import club.joylink.rtss.entity.DraftMapRunLevel; import club.joylink.rtss.util.JsonUtils; import club.joylink.rtss.vo.client.runplan.user.RunPlanRunlevelVO; +import club.joylink.rtss.vo.map.MapRoutingSectionNewVO; import club.joylink.rtss.vo.map.validate.RunLevelCreateCheck; import club.joylink.rtss.vo.map.validate.RunLevelGenerateCheck; import club.joylink.rtss.vo.map.validate.RunLevelUpdateCheck;