逻辑数据移到新包

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;

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;

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;

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;

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.logic.MapRouteOverrunVO;
-import club.joylink.rtss.vo.map.MapRouteOverrunVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

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.*;

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.*;

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.*;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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 {

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;

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;

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;

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;

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;

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;
 

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;

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;
 

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;

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 {

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.logic.MapRoutingDataVO;
-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.map.query.MapRunLevelQueryVO;
 import com.github.pagehelper.Page;

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;
 

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;

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;

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;

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;

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;
 

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;

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;

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;

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;

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;

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.logic.MapStationParkingTimeVO;
-import club.joylink.rtss.vo.map.MapStationRunLevelVO;
+import club.joylink.rtss.vo.map.logic.MapStationRunLevelVO;
 import club.joylink.rtss.vo.map.MapVO;
 import org.springframework.util.CollectionUtils;
 

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;

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;

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;
 

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;

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;

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;

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;

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;

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;

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.*;

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;

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;

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;

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;

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;

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;

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;

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;

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;