Merge remote-tracking branch 'origin/test' into third-part-control

# Conflicts:
#	src/main/java/club/joylink/rtss/controller/runplan/RunPlanDraftController.java
#	src/main/java/club/joylink/rtss/services/IRealLineService.java
#	src/main/java/club/joylink/rtss/services/RealLineService.java
#	src/main/java/club/joylink/rtss/services/SysUserService.java
#	src/main/java/club/joylink/rtss/services/simulation/ProjectSimulationServiceImpl.java
#	src/main/java/club/joylink/rtss/services/simulation/SchedulingServiceImpl.java
#	src/main/java/club/joylink/rtss/simulation/cbtc/ProjectJointSimulationServiceImpl.java
#	src/main/java/club/joylink/rtss/simulation/cbtc/data/vo/SimulationVO.java
#	src/main/java/club/joylink/rtss/simulation/rt/RtSimulationService.java

src/main/java/club/joylink/rtss/controller/draft/DraftMapController.java

@@ -7,10 +7,14 @@ import club.joylink.rtss.vo.client.PageQueryVO;
 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.client.map.newmap.*;
 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.query.MapAutoReentryQueryVO;
+import club.joylink.rtss.vo.map.query.MapDestinationCodeDefinitionQueryVO;
+import club.joylink.rtss.vo.map.query.MapParkTimeQueryVO;
+import club.joylink.rtss.vo.map.query.MapRoutingDataQueryVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -186,14 +190,14 @@ public class DraftMapController {
     public void createApproachSection(@RequestBody @Validated MapSignalApproachSectionVO approachSectionVO) {
         this.iDraftMapService.createApproachSection(approachSectionVO);
     }
-
+//
-    @ApiOperation(value = "分页查询信号机接近区段列表")
+//    @ApiOperation(value = "分页查询信号机接近区段列表")
-    @GetMapping(path = "/{mapId}/approachSection/paging")
+//    @GetMapping(path = "/{mapId}/approachSection/paging")
-    public PageVO<MapSignalApproachSectionVO> queryPagedApproachSection(
+//    public PageVO<MapSignalApproachSectionVO> queryPagedApproachSection(
-            @PathVariable Long mapId,
+//            @PathVariable Long mapId,
-            MapApproachSectionQueryVO queryVO) {
+//            MapApproachSectionQueryVO queryVO) {
-        return this.iDraftMapService.queryPagedApproachSection(mapId, queryVO);
+//        return this.iDraftMapService.queryPagedApproachSection(mapId, queryVO);
-    }
+//    }
 
     @ApiOperation(value = "根据id查询信号机接近区段")
     @GetMapping(path = "/approachSection/{id}")

src/main/java/club/joylink/rtss/controller/draft/DraftMapFlankProtectionController.java

@@ -2,10 +2,8 @@ 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.client.map.newmap.MapRouteFlankProtectionNewVO;
+import club.joylink.rtss.vo.map.MapRouteFlankProtectionNewVO;
-import club.joylink.rtss.vo.client.map.newmap.MapRouteFlankProtectionQueryVO;
+import club.joylink.rtss.vo.map.query.MapRouteFlankProtectionQueryVO;
-import club.joylink.rtss.vo.client.map.newmap.validate.RunLevelCreateCheck;
-import club.joylink.rtss.vo.client.map.newmap.validate.RunLevelUpdateCheck;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -13,8 +11,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 @Api(tags = {"草稿地图侧防管理接口"})
 @RestController
 @RequestMapping("/api/draftMap/flankProtection")

src/main/java/club/joylink/rtss/controller/draft/DraftMapFlsController.java

@@ -2,8 +2,8 @@ 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.client.map.newmap.MapRouteFlankProtectionNewVO;
+import club.joylink.rtss.vo.map.MapRouteFlankProtectionNewVO;
-import club.joylink.rtss.vo.client.map.newmap.MapRouteFlankProtectionQueryVO;
+import club.joylink.rtss.vo.map.query.MapRouteFlankProtectionQueryVO;
 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/DraftMapOverlapController.java

@@ -2,8 +2,8 @@ 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.client.map.newmap.MapOverlapQueryVO;
+import club.joylink.rtss.vo.map.MapOverlapVO;
-import club.joylink.rtss.vo.client.map.newmap.MapOverlapVO;
+import club.joylink.rtss.vo.map.query.MapOverlapQueryVO;
 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/DraftMapParkTimeController.java

@@ -1,7 +1,7 @@
 package club.joylink.rtss.controller.draft;
 
 import club.joylink.rtss.services.draftData.ParkTimeService;
-import club.joylink.rtss.vo.client.map.newmap.MapStationParkingTimeVO;
+import club.joylink.rtss.vo.map.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.client.map.newmap.MapRouteNewVO;
+import club.joylink.rtss.vo.map.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.client.map.newmap.MapStationRunLevelVO;
+import club.joylink.rtss.vo.map.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,8 +3,8 @@ 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.client.map.newmap.MapSASQueryVO;
+import club.joylink.rtss.vo.map.MapSignalApproachSectionVO;
-import club.joylink.rtss.vo.client.map.newmap.MapSignalApproachSectionVO;
+import club.joylink.rtss.vo.map.query.MapSASQueryVO;
 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/DraftMapStationRunLevelController.java

@@ -2,10 +2,10 @@ 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.client.map.newmap.MapRunLevelQueryVO;
+import club.joylink.rtss.vo.map.MapStationRunLevelVO;
-import club.joylink.rtss.vo.client.map.newmap.MapStationRunLevelVO;
+import club.joylink.rtss.vo.map.query.MapRunLevelQueryVO;
-import club.joylink.rtss.vo.client.map.newmap.validate.RunLevelCreateCheck;
+import club.joylink.rtss.vo.map.validate.RunLevelCreateCheck;
-import club.joylink.rtss.vo.client.map.newmap.validate.RunLevelUpdateCheck;
+import club.joylink.rtss.vo.map.validate.RunLevelUpdateCheck;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

src/main/java/club/joylink/rtss/controller/publish/MapController.java

@@ -10,9 +10,10 @@ import club.joylink.rtss.vo.AccountVO;
 import club.joylink.rtss.vo.LoginUserInfoVO;
 import club.joylink.rtss.vo.client.*;
 import club.joylink.rtss.vo.client.local.LocalDataVO;
-import club.joylink.rtss.vo.client.map.*;
+import club.joylink.rtss.vo.client.map.MapCopyOption;
-import club.joylink.rtss.vo.client.map.newmap.*;
+import club.joylink.rtss.vo.client.map.MapInfoUpdateVO;
 import club.joylink.rtss.vo.client.validGroup.MapInfoSortCheck;
+import club.joylink.rtss.vo.map.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/club/joylink/rtss/controller/publish/RealLineController.java

@@ -3,10 +3,10 @@ package club.joylink.rtss.controller.publish;
 import club.joylink.rtss.services.IRealLineService;
 import club.joylink.rtss.vo.AccountVO;
 import club.joylink.rtss.vo.client.PageVO;
-import club.joylink.rtss.vo.client.map.RealLineConfigVO;
 import club.joylink.rtss.vo.client.map.RealLineListVO;
-import club.joylink.rtss.vo.client.map.RealLineQueryVO;
+import club.joylink.rtss.vo.map.RealLineConfigVO;
-import club.joylink.rtss.vo.client.map.RealLineVO;
+import club.joylink.rtss.vo.map.RealLineVO;
+import club.joylink.rtss.vo.map.query.RealLineQueryVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/club/joylink/rtss/controller/runplan/RunPlanDraftController.java

@@ -14,6 +14,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.runplan.RunPlanInputData;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

src/main/java/club/joylink/rtss/controller/simulation/SimulationV1Controller.java

@@ -22,8 +22,6 @@ import club.joylink.rtss.vo.LoginUserInfoVO;
 import club.joylink.rtss.vo.client.PageVO;
 import club.joylink.rtss.vo.client.fault.FaultRuleVO;
 import club.joylink.rtss.vo.client.map.DestinationCodeVO;
-import club.joylink.rtss.vo.client.map.MapVO;
-import club.joylink.rtss.vo.client.map.newmap.MapStationNewVO;
 import club.joylink.rtss.vo.client.psl.PslStatus;
 import club.joylink.rtss.vo.client.runplan.PlanTripNumberVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanEChartsDataVO;
@@ -31,6 +29,8 @@ import club.joylink.rtss.vo.client.simulationv1.RunAsPlanParam;
 import club.joylink.rtss.vo.client.simulationv1.SimulationLogPagedQueryVO;
 import club.joylink.rtss.vo.client.simulationv1.SimulationMemberVO;
 import club.joylink.rtss.vo.client.simulationv1.SimulationUserVO;
+import club.joylink.rtss.vo.map.MapStationNewVO;
+import club.joylink.rtss.vo.map.MapVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/club/joylink/rtss/controller/simulation/rt/RtSimulationController.java

@@ -4,7 +4,7 @@ import club.joylink.rtss.constants.MapPrdTypeEnum;
 import club.joylink.rtss.simulation.rt.RtSimulationService;
 import club.joylink.rtss.simulation.rt.vo.RtSimulationInfoVO;
 import club.joylink.rtss.vo.LoginUserInfoVO;
-import club.joylink.rtss.vo.client.map.MapVO;
+import club.joylink.rtss.vo.map.MapVO;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

src/main/java/club/joylink/rtss/services/DraftMapService.java

@@ -13,7 +13,11 @@ import club.joylink.rtss.vo.client.PageQueryVO;
 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.client.map.newmap.*;
+import club.joylink.rtss.vo.map.*;
+import club.joylink.rtss.vo.map.query.MapAutoReentryQueryVO;
+import club.joylink.rtss.vo.map.query.MapDestinationCodeDefinitionQueryVO;
+import club.joylink.rtss.vo.map.query.MapParkTimeQueryVO;
+import club.joylink.rtss.vo.map.query.MapRoutingDataQueryVO;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import lombok.extern.slf4j.Slf4j;
@@ -652,21 +656,21 @@ public class DraftMapService implements IDraftMapService {
         this.draftMapSignalApproachSectionDAO.insert(approachSection);
     }
 
-    @Override
+//    @Override
-    public PageVO<MapSignalApproachSectionVO> queryPagedApproachSection(Long mapId, MapApproachSectionQueryVO queryVO) {
+//    public PageVO<MapSignalApproachSectionVO> queryPagedApproachSection(Long mapId, MapApproachSectionQueryVO queryVO) {
-        Objects.requireNonNull(mapId);
+//        Objects.requireNonNull(mapId);
-        PageHelper.startPage(queryVO.getPageNum(), queryVO.getPageSize());
+//        PageHelper.startPage(queryVO.getPageNum(), queryVO.getPageSize());
-        DraftMapSignalApproachSectionExample example = new DraftMapSignalApproachSectionExample();
+//        DraftMapSignalApproachSectionExample example = new DraftMapSignalApproachSectionExample();
-        DraftMapSignalApproachSectionExample.Criteria criteria = example.createCriteria();
+//        DraftMapSignalApproachSectionExample.Criteria criteria = example.createCriteria();
-        criteria.andMapIdEqualTo(mapId);
+//        criteria.andMapIdEqualTo(mapId);
-        if (StringUtils.hasText(queryVO.getSignalCode())) {
+//        if (StringUtils.hasText(queryVO.getSignalCode())) {
-            criteria.andSignalCodeEqualTo(queryVO.getSignalCode());
+//            criteria.andSignalCodeEqualTo(queryVO.getSignalCode());
-        }
+//        }
-        Page<DraftMapSignalApproachSection> page = (Page<DraftMapSignalApproachSection>)
+//        Page<DraftMapSignalApproachSection> page = (Page<DraftMapSignalApproachSection>)
-                this.draftMapSignalApproachSectionDAO.selectByExampleWithBLOBs(example);
+//                this.draftMapSignalApproachSectionDAO.selectByExampleWithBLOBs(example);
-        List<MapSignalApproachSectionVO> voList = MapSignalApproachSectionVO.convert2VOList(page.getResult());
+//        List<MapSignalApproachSectionVO> voList = MapSignalApproachSectionVO.convert2VOList(page.getResult());
-        return PageVO.convert(page, voList);
+//        return PageVO.convert(page, voList);
-    }
+//    }
 
     @Override
     public MapSignalApproachSectionVO getApproachSectionById(Long id) {

src/main/java/club/joylink/rtss/services/ExamService.java

@@ -12,7 +12,7 @@ import club.joylink.rtss.simulation.cbtc.GroupSimulationService;
 import club.joylink.rtss.vo.AccountVO;
 import club.joylink.rtss.vo.LoginUserInfoVO;
 import club.joylink.rtss.vo.client.*;
-import club.joylink.rtss.vo.client.map.MapVO;
+import club.joylink.rtss.vo.map.MapVO;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import lombok.NonNull;

src/main/java/club/joylink/rtss/services/IDraftMapService.java

@@ -5,7 +5,11 @@ import club.joylink.rtss.vo.client.PageQueryVO;
 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.client.map.newmap.*;
+import club.joylink.rtss.vo.map.*;
+import club.joylink.rtss.vo.map.query.MapAutoReentryQueryVO;
+import club.joylink.rtss.vo.map.query.MapDestinationCodeDefinitionQueryVO;
+import club.joylink.rtss.vo.map.query.MapParkTimeQueryVO;
+import club.joylink.rtss.vo.map.query.MapRoutingDataQueryVO;
 
 import java.util.List;
 import java.util.Map;
@@ -154,7 +158,7 @@ public interface IDraftMapService {
 
     void createApproachSection(MapSignalApproachSectionVO approachSectionVO);
 
-    PageVO<MapSignalApproachSectionVO> queryPagedApproachSection(Long mapId, MapApproachSectionQueryVO queryVO);
+//    PageVO<MapSignalApproachSectionVO> queryPagedApproachSection(Long mapId, MapApproachSectionQueryVO queryVO);
 
     MapSignalApproachSectionVO getApproachSectionById(Long id);
 

src/main/java/club/joylink/rtss/services/IMapService.java

@@ -6,11 +6,10 @@ import club.joylink.rtss.vo.client.DictionaryDetailVO;
 import club.joylink.rtss.vo.client.MapQueryVO;
 import club.joylink.rtss.vo.client.PageQueryVO;
 import club.joylink.rtss.vo.client.PageVO;
-import club.joylink.rtss.vo.client.map.*;
+import club.joylink.rtss.vo.client.map.MapCopyOption;
-import club.joylink.rtss.vo.client.map.newmap.MapPSDVO;
+import club.joylink.rtss.vo.client.map.MapDataVO;
-import club.joylink.rtss.vo.client.map.newmap.MapSectionNewVO;
+import club.joylink.rtss.vo.client.map.MapInfoUpdateVO;
-import club.joylink.rtss.vo.client.map.newmap.MapStationNewVO;
+import club.joylink.rtss.vo.map.*;
-import club.joylink.rtss.vo.client.map.newmap.MapStationStandNewVO;
 
 import java.util.List;
 

src/main/java/club/joylink/rtss/services/IRealLineService.java

@@ -2,10 +2,10 @@ package club.joylink.rtss.services;
 
 import club.joylink.rtss.vo.AccountVO;
 import club.joylink.rtss.vo.client.PageVO;
-import club.joylink.rtss.vo.client.map.RealLineConfigVO;
 import club.joylink.rtss.vo.client.map.RealLineListVO;
-import club.joylink.rtss.vo.client.map.RealLineQueryVO;
+import club.joylink.rtss.vo.map.RealLineConfigVO;
-import club.joylink.rtss.vo.client.map.RealLineVO;
+import club.joylink.rtss.vo.map.RealLineVO;
+import club.joylink.rtss.vo.map.query.RealLineQueryVO;
 
 import java.util.List;
 

src/main/java/club/joylink/rtss/services/IRunPlanDraftService.java

@@ -4,8 +4,8 @@ import club.joylink.rtss.vo.AccountVO;
 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.map.newmap.MapStationRunLevelVO;
 import club.joylink.rtss.vo.client.runplan.*;
+import club.joylink.rtss.vo.map.MapStationRunLevelVO;
 import club.joylink.rtss.vo.runplan.RunPlanInputData;
 import org.springframework.transaction.annotation.Transactional;
 

src/main/java/club/joylink/rtss/services/LessonDraftService.java

@@ -9,7 +9,7 @@ import club.joylink.rtss.exception.BusinessExceptionAssertEnum;
 import club.joylink.rtss.vo.AccountVO;
 import club.joylink.rtss.vo.LoginUserInfoVO;
 import club.joylink.rtss.vo.client.*;
-import club.joylink.rtss.vo.client.map.MapVO;
+import club.joylink.rtss.vo.map.MapVO;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import lombok.extern.slf4j.Slf4j;

src/main/java/club/joylink/rtss/services/LessonService.java

@@ -14,9 +14,9 @@ import club.joylink.rtss.util.VersionUtil;
 import club.joylink.rtss.vo.AccountVO;
 import club.joylink.rtss.vo.LoginUserInfoVO;
 import club.joylink.rtss.vo.client.*;
-import club.joylink.rtss.vo.client.map.MapVO;
 import club.joylink.rtss.vo.client.training.TrainingNewVO;
 import club.joylink.rtss.vo.client.userPermission.UserPermissionVO;
+import club.joylink.rtss.vo.map.MapVO;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import lombok.NonNull;

src/main/java/club/joylink/rtss/services/LoadPlanService.java

@@ -9,10 +9,10 @@ import club.joylink.rtss.entity.RunPlanTemplate;
 import club.joylink.rtss.exception.BusinessExceptionAssertEnum;
 import club.joylink.rtss.vo.AccountVO;
 import club.joylink.rtss.vo.client.PageVO;
-import club.joylink.rtss.vo.client.map.MapVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanLoadQueryVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanLoadVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanVO;
+import club.joylink.rtss.vo.map.MapVO;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/club/joylink/rtss/services/MapService.java

@@ -22,12 +22,14 @@ import club.joylink.rtss.vo.client.DictionaryDetailVO;
 import club.joylink.rtss.vo.client.MapQueryVO;
 import club.joylink.rtss.vo.client.PageQueryVO;
 import club.joylink.rtss.vo.client.PageVO;
-import club.joylink.rtss.vo.client.map.*;
+import club.joylink.rtss.vo.client.map.MapCopyOption;
-import club.joylink.rtss.vo.client.map.newmap.*;
+import club.joylink.rtss.vo.client.map.MapDataVO;
+import club.joylink.rtss.vo.client.map.MapInfoUpdateVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanLoadVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanVO;
 import club.joylink.rtss.vo.client.runplan.user.RunPlanRoutingVO;
 import club.joylink.rtss.vo.client.schedulingNew.SchedulingPlanNewVO;
+import club.joylink.rtss.vo.map.*;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import lombok.extern.slf4j.Slf4j;

src/main/java/club/joylink/rtss/services/MapSystemService.java

@@ -14,12 +14,12 @@ import club.joylink.rtss.vo.client.ExamDefinitionVO;
 import club.joylink.rtss.vo.client.LessonVO;
 import club.joylink.rtss.vo.client.PageVO;
 import club.joylink.rtss.vo.client.TreeNode;
-import club.joylink.rtss.vo.client.map.MapVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanVO;
 import club.joylink.rtss.vo.client.sub.MapSystemDetailVO;
 import club.joylink.rtss.vo.client.sub.MapSystemQueryVO;
 import club.joylink.rtss.vo.client.sub.MapSystemVO;
 import club.joylink.rtss.vo.client.userPermission.UserPermissionVO;
+import club.joylink.rtss.vo.map.MapVO;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import lombok.extern.slf4j.Slf4j;

src/main/java/club/joylink/rtss/services/PermissionDistributeService.java

@@ -14,7 +14,6 @@ import club.joylink.rtss.services.auth.IAuthenticateService;
 import club.joylink.rtss.vo.AccountVO;
 import club.joylink.rtss.vo.client.PageVO;
 import club.joylink.rtss.vo.client.goods.GoodsVO;
-import club.joylink.rtss.vo.client.map.MapVO;
 import club.joylink.rtss.vo.client.order.OrderCreateVO;
 import club.joylink.rtss.vo.client.order.OrderDetailCreateVO;
 import club.joylink.rtss.vo.client.order.OrderDetailVO;
@@ -26,6 +25,7 @@ import club.joylink.rtss.vo.client.userPermission.UserPermissionAndAmountVO;
 import club.joylink.rtss.vo.client.userPermission.UserPermissionDistributeVO;
 import club.joylink.rtss.vo.client.userPermission.UserPermissionVO;
 import club.joylink.rtss.vo.client.validGroup.ValidList;
+import club.joylink.rtss.vo.map.MapVO;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import lombok.extern.slf4j.Slf4j;

src/main/java/club/joylink/rtss/services/PermissionService.java

@@ -11,11 +11,11 @@ import club.joylink.rtss.exception.BusinessExceptionAssertEnum;
 import club.joylink.rtss.vo.AccountVO;
 import club.joylink.rtss.vo.client.LessonVO;
 import club.joylink.rtss.vo.client.PageVO;
-import club.joylink.rtss.vo.client.map.MapVO;
 import club.joylink.rtss.vo.client.permission.PermissionCreateVO;
 import club.joylink.rtss.vo.client.permission.PermissionQueryVO;
 import club.joylink.rtss.vo.client.permission.PermissionUpdateVO;
 import club.joylink.rtss.vo.client.permission.PermissionVO;
+import club.joylink.rtss.vo.map.MapVO;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/club/joylink/rtss/services/RealLineService.java

@@ -7,7 +7,11 @@ import club.joylink.rtss.exception.BusinessExceptionAssertEnum;
 import club.joylink.rtss.util.JsonUtils;
 import club.joylink.rtss.vo.AccountVO;
 import club.joylink.rtss.vo.client.PageVO;
-import club.joylink.rtss.vo.client.map.*;
+import club.joylink.rtss.vo.client.map.RealLineListVO;
+import club.joylink.rtss.vo.map.MapVO;
+import club.joylink.rtss.vo.map.RealLineConfigVO;
+import club.joylink.rtss.vo.map.RealLineVO;
+import club.joylink.rtss.vo.map.query.RealLineQueryVO;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/club/joylink/rtss/services/ReleaseReviewService.java

@@ -7,11 +7,11 @@ import club.joylink.rtss.services.script.IScriptService;
 import club.joylink.rtss.vo.AccountVO;
 import club.joylink.rtss.vo.LoginUserInfoVO;
 import club.joylink.rtss.vo.client.*;
-import club.joylink.rtss.vo.client.map.MapVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanQueryVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanVO;
 import club.joylink.rtss.vo.client.script.ScriptQueryVO;
 import club.joylink.rtss.vo.client.script.ScriptVO;
+import club.joylink.rtss.vo.map.MapVO;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import lombok.extern.slf4j.Slf4j;

src/main/java/club/joylink/rtss/services/ReleaseService.java

@@ -10,7 +10,7 @@ import club.joylink.rtss.vo.AccountVO;
 import club.joylink.rtss.vo.client.ReleaseConfigVO;
 import club.joylink.rtss.vo.client.ReleaseVO;
 import club.joylink.rtss.vo.client.map.MapInfoUpdateVO;
-import club.joylink.rtss.vo.client.map.MapVO;
+import club.joylink.rtss.vo.map.MapVO;
 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/RunPlanDraftService.java

@@ -18,12 +18,10 @@ import club.joylink.rtss.util.JsonUtils;
 import club.joylink.rtss.vo.AccountVO;
 import club.joylink.rtss.vo.LoginUserInfoVO;
 import club.joylink.rtss.vo.client.PageVO;
-import club.joylink.rtss.vo.client.map.MapVO;
-import club.joylink.rtss.vo.client.map.RealLineConfigVO;
-import club.joylink.rtss.vo.client.map.newmap.*;
 import club.joylink.rtss.vo.client.runplan.*;
 import club.joylink.rtss.vo.client.runplan.user.RunPlanRoutingVO;
 import club.joylink.rtss.vo.client.runplan.user.RunPlanRunlevelVO;
+import club.joylink.rtss.vo.map.*;
 import club.joylink.rtss.vo.runplan.RunPlanInputData;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;

src/main/java/club/joylink/rtss/services/RunPlanTemplateService.java

@@ -14,8 +14,8 @@ import club.joylink.rtss.util.JsonUtils;
 import club.joylink.rtss.util.VersionUtil;
 import club.joylink.rtss.vo.AccountVO;
 import club.joylink.rtss.vo.client.PageVO;
-import club.joylink.rtss.vo.client.map.MapVO;
 import club.joylink.rtss.vo.client.runplan.*;
+import club.joylink.rtss.vo.map.MapVO;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/club/joylink/rtss/services/SysUserService.java

@@ -17,9 +17,9 @@ import club.joylink.rtss.util.EncryptUtil;
 import club.joylink.rtss.util.RandomGenerator;
 import club.joylink.rtss.vo.*;
 import club.joylink.rtss.vo.client.PageVO;
-import club.joylink.rtss.vo.client.map.MapVO;
 import club.joylink.rtss.vo.client.org.CompanyVO;
 import club.joylink.rtss.vo.client.user.*;
+import club.joylink.rtss.vo.map.MapVO;
 import club.joylink.rtss.vo.user.AccountCreateVO;
 import club.joylink.rtss.vo.wx.WmUserSession;
 import club.joylink.rtss.vo.wx.WxUserGet;

src/main/java/club/joylink/rtss/services/UserUsageStatsService.java

@@ -13,7 +13,7 @@ import club.joylink.rtss.vo.AccountVO;
 import club.joylink.rtss.vo.client.LessonVO;
 import club.joylink.rtss.vo.client.UsageTotalStatsVO;
 import club.joylink.rtss.vo.client.UserRankStatsVO;
-import club.joylink.rtss.vo.client.map.MapVO;
+import club.joylink.rtss.vo.map.MapVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;

src/main/java/club/joylink/rtss/services/VirtualRealityIbpService.java

@@ -72,16 +72,16 @@ public class VirtualRealityIbpService implements IVirtualRealityIbpService {
         List<Stand> upStands = station.getNormalStand(config.isRight(true));
         switch (button) {
             case XXKC:
-                downStands.forEach(stand -> ciApiService.standHoldTrain(simulation, stand.getCode(), false));
+                downStands.forEach(stand -> ciApiService.ibpHoldTrain(simulation, stand.getCode()));
                 break;
             case XXZZKC:
-                downStands.forEach(stand -> ciApiService.standHoldTrainCancel(simulation, stand.getCode(), false));
+                downStands.forEach(stand -> ciApiService.ibpHoldTrainCancel(simulation, stand.getCode()));
                 break;
             case SXKC:
-                upStands.forEach(stand -> ciApiService.standHoldTrain(simulation, stand.getCode(), false));
+                upStands.forEach(stand -> ciApiService.ibpHoldTrain(simulation, stand.getCode()));
                 break;
             case SXZZKC:
-                upStands.forEach(stand -> ciApiService.standHoldTrainCancel(simulation, stand.getCode(), false));
+                upStands.forEach(stand -> ciApiService.ibpHoldTrainCancel(simulation, stand.getCode()));
                 break;
             case JJTC:
                 upStands.forEach(stand -> ciApiService.standEC(simulation, stand));
@@ -175,9 +175,9 @@ public class VirtualRealityIbpService implements IVirtualRealityIbpService {
         List<Stand> downStands = station.getNormalStand(config.isRight(false));
         List<Stand> upStands = station.getNormalStand(config.isRight(true));
         //下行扣车
-        vrIbp.setXxkcLight(downStands.stream().anyMatch(Stand::isStationHoldTrain));
+        vrIbp.setXxkcLight(downStands.stream().anyMatch(Stand::isIbpHoldTrain));
         //上行扣车
-        vrIbp.setSxkcLight(upStands.stream().anyMatch(Stand::isStationHoldTrain));
+        vrIbp.setSxkcLight(upStands.stream().anyMatch(Stand::isIbpHoldTrain));
         //紧急停车灯
         vrIbp.setJjtcLight(downStands.stream().allMatch(Stand::isEmergencyClosed) && upStands.stream().allMatch(Stand::isEmergencyClosed));
         //下行关门

src/main/java/club/joylink/rtss/services/check/MapDataCheckService.java

@@ -1,9 +1,9 @@
 package club.joylink.rtss.services.check;
 
-import club.joylink.rtss.vo.client.map.MapSwitchVO;
+import club.joylink.rtss.vo.map.MapGraphDataNewVO;
-import club.joylink.rtss.vo.client.map.MapVO;
+import club.joylink.rtss.vo.map.MapSectionNewVO;
-import club.joylink.rtss.vo.client.map.newmap.MapGraphDataNewVO;
+import club.joylink.rtss.vo.map.MapSwitchVO;
-import club.joylink.rtss.vo.client.map.newmap.MapSectionNewVO;
+import club.joylink.rtss.vo.map.MapVO;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;

src/main/java/club/joylink/rtss/services/completition/CompetitionPracticalService.java

@@ -28,7 +28,6 @@ import club.joylink.rtss.vo.LoginUserInfoVO;
 import club.joylink.rtss.vo.client.PageVO;
 import club.joylink.rtss.vo.client.VoiceRecognitionResult;
 import club.joylink.rtss.vo.client.competition.*;
-import club.joylink.rtss.vo.client.map.MapVO;
 import club.joylink.rtss.vo.client.order.OrderCreateVO;
 import club.joylink.rtss.vo.client.order.OrderDetailCreateVO;
 import club.joylink.rtss.vo.client.order.OrderVO;
@@ -37,6 +36,7 @@ import club.joylink.rtss.vo.client.permission.PermissionVO;
 import club.joylink.rtss.vo.client.script.ScriptActionVO;
 import club.joylink.rtss.vo.client.script.ScriptVO;
 import club.joylink.rtss.vo.client.userPermission.UserPermissionVO;
+import club.joylink.rtss.vo.map.MapVO;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import lombok.extern.slf4j.Slf4j;

src/main/java/club/joylink/rtss/services/draftData/DraftMapCiDataGenerator.java

@@ -1,6 +1,6 @@
 package club.joylink.rtss.services.draftData;
 
-import club.joylink.rtss.vo.client.map.newmap.CiGenerateResultVO;
+import club.joylink.rtss.vo.map.CiGenerateResultVO;
 
 /**
  * 草稿地图联锁数据自动生成器

src/main/java/club/joylink/rtss/services/draftData/DraftMapCiDataGeneratorImpl.java

@@ -8,8 +8,7 @@ import club.joylink.rtss.simulation.cbtc.data.support.RoutePath;
 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.client.map.MapVO;
+import club.joylink.rtss.vo.map.*;
-import club.joylink.rtss.vo.client.map.newmap.*;
 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

@@ -12,10 +12,7 @@ import club.joylink.rtss.simulation.cbtc.data.map.*;
 import club.joylink.rtss.simulation.rt.repo.CommonRepository;
 import club.joylink.rtss.simulation.rt.repo.CommonRepositoryBuilder;
 import club.joylink.rtss.util.JsonUtils;
-import club.joylink.rtss.vo.client.Point;
+import club.joylink.rtss.vo.map.*;
-import club.joylink.rtss.vo.client.map.MapSwitchVO;
-import club.joylink.rtss.vo.client.map.MapVO;
-import club.joylink.rtss.vo.client.map.newmap.*;
 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,8 +1,8 @@
 package club.joylink.rtss.services.draftData;
 
 import club.joylink.rtss.vo.client.PageVO;
-import club.joylink.rtss.vo.client.map.newmap.MapRouteFlankProtectionNewVO;
+import club.joylink.rtss.vo.map.MapRouteFlankProtectionNewVO;
-import club.joylink.rtss.vo.client.map.newmap.MapRouteFlankProtectionQueryVO;
+import club.joylink.rtss.vo.map.query.MapRouteFlankProtectionQueryVO;
 
 public interface DraftMapFlankProtectionService {
     void create(MapRouteFlankProtectionNewVO flankProtectionNewVO);

src/main/java/club/joylink/rtss/services/draftData/DraftMapFlankProtectionServiceImpl.java

@@ -5,8 +5,8 @@ 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.client.map.newmap.MapRouteFlankProtectionNewVO;
+import club.joylink.rtss.vo.map.MapRouteFlankProtectionNewVO;
-import club.joylink.rtss.vo.client.map.newmap.MapRouteFlankProtectionQueryVO;
+import club.joylink.rtss.vo.map.query.MapRouteFlankProtectionQueryVO;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import lombok.extern.slf4j.Slf4j;

src/main/java/club/joylink/rtss/services/draftData/DraftMapFlsService.java

@@ -1,8 +1,8 @@
 package club.joylink.rtss.services.draftData;
 
 import club.joylink.rtss.vo.client.PageVO;
-import club.joylink.rtss.vo.client.map.newmap.MapRouteFlankProtectionNewVO;
+import club.joylink.rtss.vo.map.MapRouteFlankProtectionNewVO;
-import club.joylink.rtss.vo.client.map.newmap.MapRouteFlankProtectionQueryVO;
+import club.joylink.rtss.vo.map.query.MapRouteFlankProtectionQueryVO;
 
 import java.util.List;
 

src/main/java/club/joylink/rtss/services/draftData/DraftMapFlsServiceImpl.java

@@ -5,8 +5,8 @@ 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.client.map.newmap.MapRouteFlankProtectionNewVO;
+import club.joylink.rtss.vo.map.MapRouteFlankProtectionNewVO;
-import club.joylink.rtss.vo.client.map.newmap.MapRouteFlankProtectionQueryVO;
+import club.joylink.rtss.vo.map.query.MapRouteFlankProtectionQueryVO;
 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/DraftMapOverlapService.java

@@ -1,8 +1,8 @@
 package club.joylink.rtss.services.draftData;
 
 import club.joylink.rtss.vo.client.PageVO;
-import club.joylink.rtss.vo.client.map.newmap.MapOverlapQueryVO;
+import club.joylink.rtss.vo.map.MapOverlapVO;
-import club.joylink.rtss.vo.client.map.newmap.MapOverlapVO;
+import club.joylink.rtss.vo.map.query.MapOverlapQueryVO;
 
 import java.util.List;
 

src/main/java/club/joylink/rtss/services/draftData/DraftMapOverlapServiceImpl.java

@@ -5,8 +5,8 @@ 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.client.map.newmap.MapOverlapQueryVO;
+import club.joylink.rtss.vo.map.MapOverlapVO;
-import club.joylink.rtss.vo.client.map.newmap.MapOverlapVO;
+import club.joylink.rtss.vo.map.query.MapOverlapQueryVO;
 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.client.map.newmap.MapRouteNewVO;
+import club.joylink.rtss.vo.map.MapRouteNewVO;
 
 import java.util.List;
 

src/main/java/club/joylink/rtss/services/draftData/DraftMapRouteServiceImpl.java

@@ -9,8 +9,8 @@ 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.client.map.MapRouteQueryVO;
-import club.joylink.rtss.vo.client.map.newmap.MapGraphDataNewVO;
+import club.joylink.rtss.vo.map.MapGraphDataNewVO;
-import club.joylink.rtss.vo.client.map.newmap.MapRouteNewVO;
+import club.joylink.rtss.vo.map.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,8 +1,8 @@
 package club.joylink.rtss.services.draftData;
 
 import club.joylink.rtss.vo.client.PageVO;
-import club.joylink.rtss.vo.client.map.newmap.MapRunLevelQueryVO;
+import club.joylink.rtss.vo.map.MapStationRunLevelVO;
-import club.joylink.rtss.vo.client.map.newmap.MapStationRunLevelVO;
+import club.joylink.rtss.vo.map.query.MapRunLevelQueryVO;
 
 public interface DraftMapRunLevelService {
 

src/main/java/club/joylink/rtss/services/draftData/DraftMapRunLevelServiceImpl.java

@@ -11,10 +11,10 @@ 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.client.map.MapVO;
+import club.joylink.rtss.vo.map.MapRoutingDataVO;
-import club.joylink.rtss.vo.client.map.newmap.MapRoutingDataVO;
+import club.joylink.rtss.vo.map.MapStationRunLevelVO;
-import club.joylink.rtss.vo.client.map.newmap.MapRunLevelQueryVO;
+import club.joylink.rtss.vo.map.MapVO;
-import club.joylink.rtss.vo.client.map.newmap.MapStationRunLevelVO;
+import club.joylink.rtss.vo.map.query.MapRunLevelQueryVO;
 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/DraftMapService.java

@@ -1,7 +1,6 @@
 package club.joylink.rtss.services.draftData;
 
-import club.joylink.rtss.vo.client.map.MapVO;
+import club.joylink.rtss.vo.map.*;
-import club.joylink.rtss.vo.client.map.newmap.*;
 
 import java.util.List;
 

src/main/java/club/joylink/rtss/services/draftData/DraftMapServiceImpl.java

@@ -3,8 +3,7 @@ package club.joylink.rtss.services.draftData;
 import club.joylink.rtss.dao.*;
 import club.joylink.rtss.entity.*;
 import club.joylink.rtss.util.JsonUtils;
-import club.joylink.rtss.vo.client.map.MapVO;
+import club.joylink.rtss.vo.map.*;
-import club.joylink.rtss.vo.client.map.newmap.*;
 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,8 +1,8 @@
 package club.joylink.rtss.services.draftData;
 
 import club.joylink.rtss.vo.client.PageVO;
-import club.joylink.rtss.vo.client.map.newmap.MapSASQueryVO;
+import club.joylink.rtss.vo.map.MapSignalApproachSectionVO;
-import club.joylink.rtss.vo.client.map.newmap.MapSignalApproachSectionVO;
+import club.joylink.rtss.vo.map.query.MapSASQueryVO;
 
 import java.util.List;
 

src/main/java/club/joylink/rtss/services/draftData/DraftMapSignalApproachSectionServiceImpl.java

@@ -7,9 +7,9 @@ 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.client.map.MapVO;
+import club.joylink.rtss.vo.map.MapSignalApproachSectionVO;
-import club.joylink.rtss.vo.client.map.newmap.MapSASQueryVO;
+import club.joylink.rtss.vo.map.MapVO;
-import club.joylink.rtss.vo.client.map.newmap.MapSignalApproachSectionVO;
+import club.joylink.rtss.vo.map.query.MapSASQueryVO;
 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/ParkTimeService.java

@@ -7,8 +7,8 @@ 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.client.map.MapVO;
+import club.joylink.rtss.vo.map.MapStationParkingTimeVO;
-import club.joylink.rtss.vo.client.map.newmap.MapStationParkingTimeVO;
+import club.joylink.rtss.vo.map.MapVO;
 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/RailwayRouteGenerator.java

@@ -2,8 +2,8 @@ package club.joylink.rtss.services.draftData;
 
 import club.joylink.rtss.exception.BusinessExceptionAssertEnum;
 import club.joylink.rtss.simulation.rt.repo.*;
-import club.joylink.rtss.vo.client.map.newmap.MapCISwitchVO;
+import club.joylink.rtss.vo.map.MapCISwitchVO;
-import club.joylink.rtss.vo.client.map.newmap.MapRouteNewVO;
+import club.joylink.rtss.vo.map.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.client.map.newmap.MapRoutingDataVO;
+import club.joylink.rtss.vo.map.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,10 +9,10 @@ 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.client.map.MapVO;
+import club.joylink.rtss.vo.map.MapRoutingDataVO;
-import club.joylink.rtss.vo.client.map.newmap.MapRoutingDataVO;
+import club.joylink.rtss.vo.map.MapRoutingSectionNewVO;
-import club.joylink.rtss.vo.client.map.newmap.MapRoutingSectionNewVO;
+import club.joylink.rtss.vo.map.MapStationRunLevelVO;
-import club.joylink.rtss.vo.client.map.newmap.MapStationRunLevelVO;
+import club.joylink.rtss.vo.map.MapVO;
 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/SignalApproachSectionGenerator.java

@@ -1,8 +1,8 @@
 package club.joylink.rtss.services.draftData;
 
 import club.joylink.rtss.simulation.rt.repo.*;
-import club.joylink.rtss.vo.client.map.newmap.MapSectionPathVO;
+import club.joylink.rtss.vo.map.MapSectionPathVO;
-import club.joylink.rtss.vo.client.map.newmap.MapSignalApproachSectionVO;
+import club.joylink.rtss.vo.map.MapSignalApproachSectionVO;
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.stereotype.Component;

src/main/java/club/joylink/rtss/services/pay/wechat/WechatPayService.java

@@ -12,7 +12,6 @@ import club.joylink.rtss.services.pay.wechat.bean.WxUnifiedOrder;
 import club.joylink.rtss.util.JsonUtils;
 import club.joylink.rtss.vo.AccountVO;
 import club.joylink.rtss.vo.client.goods.GoodsVO;
-import club.joylink.rtss.vo.client.map.MapVO;
 import club.joylink.rtss.vo.client.order.OrderDetailVO;
 import club.joylink.rtss.vo.client.order.OrderVO;
 import club.joylink.rtss.vo.client.pay.WxPayNotifyData;
@@ -22,6 +21,7 @@ import club.joylink.rtss.vo.client.pay.WxPayUnifiedOrderResultVO;
 import club.joylink.rtss.vo.client.permission.PermissionVO;
 import club.joylink.rtss.vo.client.permissionDistribute.DistributeVO;
 import club.joylink.rtss.vo.client.userPermission.UserPermissionVO;
+import club.joylink.rtss.vo.map.MapVO;
 import com.wechat.pay.contrib.apache.httpclient.WechatPayHttpClientBuilder;
 import com.wechat.pay.contrib.apache.httpclient.auth.AutoUpdateCertificatesVerifier;
 import com.wechat.pay.contrib.apache.httpclient.auth.PrivateKeySigner;

src/main/java/club/joylink/rtss/services/publishData/FuZhouLineOne1PassengerFlowDataServiceImpl.java

@@ -1,13 +1,5 @@
 package club.joylink.rtss.services.publishData;
 
-import club.joylink.rtss.services.cache.ICacheService;
-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.Stand;
-import club.joylink.rtss.simulation.cbtc.data.map.Station;
-import club.joylink.rtss.simulation.cbtc.passenger.data.PassengerFlowData;
-import club.joylink.rtss.simulation.cbtc.passenger.data.StandTimePassengerFlowData;
-import club.joylink.rtss.simulation.cbtc.passenger.data.TripStationPassengerFlowData;
 import club.joylink.rtss.constants.BusinessConsts;
 import club.joylink.rtss.dao.MapInfoDAO;
 import club.joylink.rtss.dao.MapPassengerFlowDAO;
@@ -17,10 +9,18 @@ import club.joylink.rtss.entity.MapPassengerFlowExample;
 import club.joylink.rtss.entity.MapPassengerFlowWithBLOBs;
 import club.joylink.rtss.exception.BusinessExceptionAssertEnum;
 import club.joylink.rtss.services.MapService;
+import club.joylink.rtss.services.cache.ICacheService;
+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.Stand;
+import club.joylink.rtss.simulation.cbtc.data.map.Station;
+import club.joylink.rtss.simulation.cbtc.passenger.data.PassengerFlowData;
+import club.joylink.rtss.simulation.cbtc.passenger.data.StandTimePassengerFlowData;
+import club.joylink.rtss.simulation.cbtc.passenger.data.TripStationPassengerFlowData;
 import club.joylink.rtss.util.DateTimeUtil;
 import club.joylink.rtss.util.JsonUtils;
-import club.joylink.rtss.vo.client.map.MapVO;
 import club.joylink.rtss.vo.client.passenger.MapPassengerFlowVO;
+import club.joylink.rtss.vo.map.MapVO;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;

src/main/java/club/joylink/rtss/services/runplan/IRunPlanRoutingService.java

@@ -1,7 +1,6 @@
 package club.joylink.rtss.services.runplan;
 
 import club.joylink.rtss.vo.client.PageVO;
-import club.joylink.rtss.vo.client.map.newmap.MapRoutingDataVO;
 import club.joylink.rtss.vo.client.runplan.user.RunPlanRoutingQueryVO;
 import club.joylink.rtss.vo.client.runplan.user.RunPlanRoutingSection;
 import club.joylink.rtss.vo.client.runplan.user.RunPlanRoutingVO;

src/main/java/club/joylink/rtss/services/runplan/RunPlanGenerator.java

@@ -2,11 +2,11 @@ package club.joylink.rtss.services.runplan;
 
 import club.joylink.rtss.constants.BusinessConsts;
 import club.joylink.rtss.exception.BusinessExceptionAssertEnum;
-import club.joylink.rtss.vo.client.map.MapVO;
-import club.joylink.rtss.vo.client.map.RealLineConfigVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanTripTimeVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanTripVO;
 import club.joylink.rtss.vo.client.runplan.user.*;
+import club.joylink.rtss.vo.map.MapVO;
+import club.joylink.rtss.vo.map.RealLineConfigVO;
 import club.joylink.rtss.vo.runplan.RunPlanInputData;
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/club/joylink/rtss/services/runplan/RunPlanRoutingService.java

@@ -15,10 +15,10 @@ import club.joylink.rtss.simulation.cbtc.data.map.Section;
 import club.joylink.rtss.simulation.cbtc.exception.SimulationException;
 import club.joylink.rtss.util.JsonUtils;
 import club.joylink.rtss.vo.client.PageVO;
-import club.joylink.rtss.vo.client.map.MapVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanTripVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanVO;
 import club.joylink.rtss.vo.client.runplan.user.*;
+import club.joylink.rtss.vo.map.MapVO;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import lombok.extern.slf4j.Slf4j;
@@ -29,7 +29,6 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import java.util.*;
-import java.util.stream.Collector;
 import java.util.stream.Collectors;
 
 @Service

src/main/java/club/joylink/rtss/services/runplan/RunPlanRunlevelService.java

@@ -11,9 +11,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.exception.SimulationException;
 import club.joylink.rtss.vo.client.PageVO;
-import club.joylink.rtss.vo.client.map.MapVO;
 import club.joylink.rtss.vo.client.runplan.user.RunPlanRunLevelQueryVO;
 import club.joylink.rtss.vo.client.runplan.user.RunPlanRunlevelVO;
+import club.joylink.rtss.vo.map.MapVO;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import lombok.extern.slf4j.Slf4j;

src/main/java/club/joylink/rtss/services/runplan/importReal/BeiJingLine1RunPlanNew.java

@@ -1,10 +1,10 @@
 package club.joylink.rtss.services.runplan.importReal;
 
 import club.joylink.rtss.exception.BusinessExceptionAssertEnum;
-import club.joylink.rtss.vo.client.map.newmap.MapStationNewVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanImport;
 import club.joylink.rtss.vo.client.runplan.RunPlanTripTimeVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanTripVO;
+import club.joylink.rtss.vo.map.MapStationNewVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.StringUtils;
 

src/main/java/club/joylink/rtss/services/runplan/importReal/ChengDuLine1RunPlanNew.java

@@ -2,11 +2,11 @@ package club.joylink.rtss.services.runplan.importReal;
 
 import club.joylink.rtss.constants.BusinessConsts;
 import club.joylink.rtss.exception.BusinessExceptionAssertEnum;
-import club.joylink.rtss.vo.client.map.newmap.MapStationNewVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanArrivalTime;
 import club.joylink.rtss.vo.client.runplan.RunPlanImport;
 import club.joylink.rtss.vo.client.runplan.RunPlanTripTimeVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanTripVO;
+import club.joylink.rtss.vo.map.MapStationNewVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.StringUtils;
 

src/main/java/club/joylink/rtss/services/runplan/importReal/ChengDuLine3RunPlanNew.java

@@ -1,11 +1,11 @@
 package club.joylink.rtss.services.runplan.importReal;
 
 import club.joylink.rtss.exception.BusinessExceptionAssertEnum;
-import club.joylink.rtss.vo.client.map.newmap.MapStationNewVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanArrivalTime;
 import club.joylink.rtss.vo.client.runplan.RunPlanImport;
 import club.joylink.rtss.vo.client.runplan.RunPlanTripTimeVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanTripVO;
+import club.joylink.rtss.vo.map.MapStationNewVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.StringUtils;
 

src/main/java/club/joylink/rtss/services/runplan/importReal/DefaultRunPlanNew.java

@@ -1,9 +1,9 @@
 package club.joylink.rtss.services.runplan.importReal;
 
-import club.joylink.rtss.vo.client.map.newmap.MapStationNewVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanImport;
 import club.joylink.rtss.vo.client.runplan.RunPlanTripTimeVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanTripVO;
+import club.joylink.rtss.vo.map.MapStationNewVO;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.List;

src/main/java/club/joylink/rtss/services/runplan/importReal/FoshanTramRunPlanNew.java

@@ -2,11 +2,11 @@ package club.joylink.rtss.services.runplan.importReal;
 
 import club.joylink.rtss.constants.BusinessConsts;
 import club.joylink.rtss.exception.BusinessExceptionAssertEnum;
-import club.joylink.rtss.vo.client.map.newmap.MapStationNewVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanArrivalTime;
 import club.joylink.rtss.vo.client.runplan.RunPlanImport;
 import club.joylink.rtss.vo.client.runplan.RunPlanTripTimeVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanTripVO;
+import club.joylink.rtss.vo.map.MapStationNewVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.StringUtils;
 

src/main/java/club/joylink/rtss/services/runplan/importReal/FuZhouLine1RunPlanNew.java

@@ -1,11 +1,11 @@
 package club.joylink.rtss.services.runplan.importReal;
 
 import club.joylink.rtss.exception.BusinessExceptionAssertEnum;
-import club.joylink.rtss.vo.client.map.newmap.MapStationNewVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanArrivalTime;
 import club.joylink.rtss.vo.client.runplan.RunPlanImport;
 import club.joylink.rtss.vo.client.runplan.RunPlanTripTimeVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanTripVO;
+import club.joylink.rtss.vo.map.MapStationNewVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.StringUtils;
 

src/main/java/club/joylink/rtss/services/runplan/importReal/HarBinLine1RunPlanNew.java

@@ -2,11 +2,11 @@ package club.joylink.rtss.services.runplan.importReal;
 
 import club.joylink.rtss.constants.BusinessConsts;
 import club.joylink.rtss.exception.BusinessExceptionAssertEnum;
-import club.joylink.rtss.vo.client.map.newmap.MapStationNewVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanArrivalTime;
 import club.joylink.rtss.vo.client.runplan.RunPlanImport;
 import club.joylink.rtss.vo.client.runplan.RunPlanTripTimeVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanTripVO;
+import club.joylink.rtss.vo.map.MapStationNewVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.StringUtils;
 

src/main/java/club/joylink/rtss/services/runplan/importReal/IRunPlanStrategyNew.java

@@ -2,13 +2,13 @@ package club.joylink.rtss.services.runplan.importReal;
 
 import club.joylink.rtss.constants.BusinessConsts;
 import club.joylink.rtss.exception.BusinessExceptionAssertEnum;
-import club.joylink.rtss.vo.client.map.newmap.MapSectionNewVO;
-import club.joylink.rtss.vo.client.map.newmap.MapStationNewVO;
-import club.joylink.rtss.vo.client.map.newmap.MapStationStandNewVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanArrivalTime;
 import club.joylink.rtss.vo.client.runplan.RunPlanImport;
 import club.joylink.rtss.vo.client.runplan.RunPlanTripTimeVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanTripVO;
+import club.joylink.rtss.vo.map.MapSectionNewVO;
+import club.joylink.rtss.vo.map.MapStationNewVO;
+import club.joylink.rtss.vo.map.MapStationStandNewVO;
 import org.springframework.util.StringUtils;
 
 import java.util.*;

src/main/java/club/joylink/rtss/services/runplan/importReal/NingBoLine1RunPlanNew.java

@@ -2,11 +2,11 @@ package club.joylink.rtss.services.runplan.importReal;
 
 import club.joylink.rtss.constants.BusinessConsts;
 import club.joylink.rtss.exception.BusinessExceptionAssertEnum;
-import club.joylink.rtss.vo.client.map.newmap.MapStationNewVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanArrivalTime;
 import club.joylink.rtss.vo.client.runplan.RunPlanImport;
 import club.joylink.rtss.vo.client.runplan.RunPlanTripTimeVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanTripVO;
+import club.joylink.rtss.vo.map.MapStationNewVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.StringUtils;
 

src/main/java/club/joylink/rtss/services/runplan/importReal/NingBoLine3RunPlanNew.java

@@ -2,11 +2,11 @@ package club.joylink.rtss.services.runplan.importReal;
 
 import club.joylink.rtss.constants.BusinessConsts;
 import club.joylink.rtss.exception.BusinessExceptionAssertEnum;
-import club.joylink.rtss.vo.client.map.newmap.MapStationNewVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanArrivalTime;
 import club.joylink.rtss.vo.client.runplan.RunPlanImport;
 import club.joylink.rtss.vo.client.runplan.RunPlanTripTimeVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanTripVO;
+import club.joylink.rtss.vo.map.MapStationNewVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.StringUtils;
 

src/main/java/club/joylink/rtss/services/runplan/importReal/XianLine1RunPlanNew.java

@@ -1,11 +1,11 @@
 package club.joylink.rtss.services.runplan.importReal;
 
 import club.joylink.rtss.exception.BusinessExceptionAssertEnum;
-import club.joylink.rtss.vo.client.map.newmap.MapStationNewVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanArrivalTime;
 import club.joylink.rtss.vo.client.runplan.RunPlanImport;
 import club.joylink.rtss.vo.client.runplan.RunPlanTripTimeVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanTripVO;
+import club.joylink.rtss.vo.map.MapStationNewVO;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.List;

src/main/java/club/joylink/rtss/services/runplan/importReal/XianLine2RunPlanNew.java

@@ -2,11 +2,11 @@ package club.joylink.rtss.services.runplan.importReal;
 
 import club.joylink.rtss.constants.BusinessConsts;
 import club.joylink.rtss.exception.BusinessExceptionAssertEnum;
-import club.joylink.rtss.vo.client.map.newmap.MapStationNewVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanArrivalTime;
 import club.joylink.rtss.vo.client.runplan.RunPlanImport;
 import club.joylink.rtss.vo.client.runplan.RunPlanTripTimeVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanTripVO;
+import club.joylink.rtss.vo.map.MapStationNewVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.StringUtils;
 

src/main/java/club/joylink/rtss/services/runplan/importReal/XianLine3RunPlanNew.java

@@ -1,10 +1,10 @@
 package club.joylink.rtss.services.runplan.importReal;
 
 import club.joylink.rtss.exception.BusinessExceptionAssertEnum;
-import club.joylink.rtss.vo.client.map.newmap.MapStationNewVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanImport;
 import club.joylink.rtss.vo.client.runplan.RunPlanTripTimeVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanTripVO;
+import club.joylink.rtss.vo.map.MapStationNewVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.StringUtils;
 

src/main/java/club/joylink/rtss/services/simulation/ProjectSimulationServiceImpl.java

@@ -13,6 +13,7 @@ import club.joylink.rtss.vo.LoginUserInfoVO;
 import club.joylink.rtss.vo.client.map.MapVO;
 import club.joylink.rtss.vo.client.simulationv1.RunAsPlanParam;
 import club.joylink.rtss.vo.client.userPermission.UserPermissionVO;
+import club.joylink.rtss.vo.map.MapVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/java/club/joylink/rtss/services/simulation/SchedulingServiceImpl.java

@@ -23,6 +23,7 @@ import club.joylink.rtss.vo.client.runplan.RunPlanVO;
 import club.joylink.rtss.vo.client.schedulingNew.SchedulingCheckResultNewVO;
 import club.joylink.rtss.vo.client.schedulingNew.SchedulingPlanDetailVO;
 import club.joylink.rtss.vo.client.schedulingNew.SchedulingPlanNewVO;
+import club.joylink.rtss.vo.map.MapVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/java/club/joylink/rtss/services/student/DepartUserStaticServiceImpl.java

@@ -7,7 +7,6 @@ import club.joylink.rtss.exception.BusinessExceptionAssertEnum;
 import club.joylink.rtss.services.*;
 import club.joylink.rtss.vo.AccountVO;
 import club.joylink.rtss.vo.client.goods.GoodsVO;
-import club.joylink.rtss.vo.client.map.MapVO;
 import club.joylink.rtss.vo.client.order.OrderCreateVO;
 import club.joylink.rtss.vo.client.order.OrderDetailCreateVO;
 import club.joylink.rtss.vo.client.permissionDistribute.DistributeVO;
@@ -15,6 +14,7 @@ import club.joylink.rtss.vo.client.student.*;
 import club.joylink.rtss.vo.client.userPermission.UserPermissionAndAmountVO;
 import club.joylink.rtss.vo.client.userPermission.UserPermissionDistributeVO;
 import club.joylink.rtss.vo.client.userPermission.UserPermissionVO;
+import club.joylink.rtss.vo.map.MapVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/java/club/joylink/rtss/services/training/GenerateTask.java

@@ -12,10 +12,10 @@ import club.joylink.rtss.simulation.cbtc.build.SimulationBuilder;
 import club.joylink.rtss.vo.client.CommandDefinitionVO;
 import club.joylink.rtss.vo.client.LessonChapterTrainingRelVO;
 import club.joylink.rtss.vo.client.LessonVO;
-import club.joylink.rtss.vo.client.training.definition.OperateDefinitionVO;
-import club.joylink.rtss.vo.client.map.MapVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanVO;
 import club.joylink.rtss.vo.client.training.TrainingNewVO;
+import club.joylink.rtss.vo.client.training.definition.OperateDefinitionVO;
+import club.joylink.rtss.vo.map.MapVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;

src/main/java/club/joylink/rtss/services/training/generatornew/GeneratorNew.java

@@ -7,16 +7,12 @@ import club.joylink.rtss.simulation.cbtc.Simulation;
 import club.joylink.rtss.simulation.cbtc.data.map.*;
 import club.joylink.rtss.simulation.cbtc.data.storage.StorageSimulation;
 import club.joylink.rtss.util.ReflectionUtils;
-import club.joylink.rtss.vo.client.map.MapVO;
-import club.joylink.rtss.vo.client.map.newmap.MapAutomaticRouteButtonVO;
-import club.joylink.rtss.vo.client.map.newmap.MapCycleButtonVO;
-import club.joylink.rtss.vo.client.map.newmap.MapTotalGuideLockButtonVO;
-import club.joylink.rtss.vo.client.map.newmap.MapTurnBackStrategyVO;
 import club.joylink.rtss.vo.client.training.TrainingNewVO;
 import club.joylink.rtss.vo.client.training.TrainingStepVO;
 import club.joylink.rtss.vo.client.training.definition.OperateDefinitionVO;
 import club.joylink.rtss.vo.client.training.definition.OperatePlaceholderVO;
 import club.joylink.rtss.vo.client.training.definition.OperateStepVO;
+import club.joylink.rtss.vo.map.*;
 import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;

src/main/java/club/joylink/rtss/services/training/generatornew/base/SpeedLimitGeneratorNew.java

@@ -1,33 +1,24 @@
 package club.joylink.rtss.services.training.generatornew.base;
 
-import club.joylink.rtss.constants.BusinessConsts;
-import club.joylink.rtss.services.training.constant.TrainingConsts;
 import club.joylink.rtss.services.training.data.GenerateConfig;
 import club.joylink.rtss.services.training.generatornew.GeneratorNew;
 import club.joylink.rtss.services.training.generatornew.annotation.GeneratorSelectorNew;
 import club.joylink.rtss.simulation.cbtc.ATP.ground.TempSpeedLimitService;
 import club.joylink.rtss.simulation.cbtc.ATS.operation.Operation;
 import club.joylink.rtss.simulation.cbtc.Simulation;
-import club.joylink.rtss.simulation.cbtc.data.map.*;
+import club.joylink.rtss.simulation.cbtc.data.map.MapElement;
 import club.joylink.rtss.simulation.cbtc.data.storage.StorageSimulation;
-import club.joylink.rtss.vo.client.map.MapTempSpeedLimitVO;
+import club.joylink.rtss.vo.client.training.TrainingNewVO;
-import club.joylink.rtss.vo.client.map.newmap.MapAutomaticRouteButtonVO;
-import club.joylink.rtss.vo.client.map.newmap.MapCycleButtonVO;
-import club.joylink.rtss.vo.client.map.newmap.MapTotalGuideLockButtonVO;
-import club.joylink.rtss.vo.client.map.newmap.MapTurnBackStrategyVO;
 import club.joylink.rtss.vo.client.training.TrainingStepVO;
 import club.joylink.rtss.vo.client.training.definition.OperateDefinitionVO;
-import club.joylink.rtss.vo.client.training.TrainingNewVO;
 import club.joylink.rtss.vo.client.training.definition.OperatePlaceholderVO;
 import club.joylink.rtss.vo.client.training.definition.OperateStepVO;
+import club.joylink.rtss.vo.map.MapTempSpeedLimitVO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.StringUtils;
 
-import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
 @GeneratorSelectorNew(operateObject = Operation.Object.LimitControl)
 public class SpeedLimitGeneratorNew implements GeneratorNew {

src/main/java/club/joylink/rtss/simulation/cbtc/ATP/ground/ZCLogicLoop.java

@@ -130,6 +130,11 @@ public class ZCLogicLoop {
         if (headPosition.getSection().isFault()) {
             endList.add(new MovementAuthority.End(headPosition.getSection(), MovementAuthority.EndType.FAULT_SECTION));
         }
+        //非通信车占用区段
+        if (section.isNonCbtcOccupy()) {
+            endList.add(new MovementAuthority.End(section, MovementAuthority.EndType.NCT_OCCUPIED_IN_FRONT_OF_SECTION));
+            return endList;
+        }
         int count = 0;
         while (count < 50) {
             ++count;
@@ -161,10 +166,6 @@ public class ZCLogicLoop {
                     endList.add(unlockedOverlapEnd);
                 }
             }
-            //非通信车占用区段
-            if (section.isNonCbtcOccupy()) {
-                endList.add(new MovementAuthority.End(section, MovementAuthority.EndType.NCT_OCCUPIED_IN_FRONT_OF_SECTION));
-            }
             // 轨道尽头/问题道岔
             Section temp = section.getNextRunningSectionOf(right);
             if (Objects.isNull(temp)) { // 到尽头
@@ -178,12 +179,12 @@ public class ZCLogicLoop {
                 break;
             }
             //非通信车占用区段
-//            if (temp.isNonCbtcOccupy()) {
+            if (temp.isNonCbtcOccupy()) {
-//                SectionPosition headPosition1 = train.getHeadPosition();
+                SectionPosition headPosition1 = train.getHeadPosition();
-//                if (!temp.isSamePhysical(headPosition1.getSection().getCode())) {
+                if (!temp.isSamePhysical(headPosition1.getSection().getCode())) {
-//                    endList.add(new MovementAuthority.End(section, MovementAuthority.EndType.NCT_OCCUPIED_IN_FRONT_OF_SECTION));
+                    endList.add(new MovementAuthority.End(temp, MovementAuthority.EndType.NCT_OCCUPIED_IN_FRONT_OF_SECTION));
-//                }
+                }
-//            }
+            }
             //检查关闭的区段
             MovementAuthority.End cs = checkClosedSection(section);
             if (cs != null)

src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/AtsPlanService.java

@@ -6,10 +6,7 @@ import club.joylink.rtss.simulation.cbtc.constant.RunLevel;
 import club.joylink.rtss.simulation.cbtc.constant.SimulationModule;
 import club.joylink.rtss.simulation.cbtc.data.CalculateService;
 import club.joylink.rtss.simulation.cbtc.data.SimulationDataRepository;
-import club.joylink.rtss.simulation.cbtc.data.map.Route;
+import club.joylink.rtss.simulation.cbtc.data.map.*;
-import club.joylink.rtss.simulation.cbtc.data.map.Section;
-import club.joylink.rtss.simulation.cbtc.data.map.Signal;
-import club.joylink.rtss.simulation.cbtc.data.map.Station;
 import club.joylink.rtss.simulation.cbtc.data.plan.RealRun;
 import club.joylink.rtss.simulation.cbtc.data.plan.StationPlan;
 import club.joylink.rtss.simulation.cbtc.data.plan.TripPlan;
@@ -696,6 +693,15 @@ public class AtsPlanService {
         this.atsStandService.updateStandParkTime(section, parkTime);
         // 更新停站时间
         this.onboardAtpApiService.updateStationParkTime(simulation, train.getGroupNumber(), parkTime);
+        // 更新扣车状态
+        List<Stand> standList = section.getStandList();
+        if (!CollectionUtils.isEmpty(standList)) {
+            if (standList.stream().anyMatch(Stand::isHoldTrain)) {
+                onboardAtpApiService.standHoldTrain(simulation, train.getGroupNumber());
+            } else {
+                onboardAtpApiService.standCancelHoldTrain(simulation, train.getGroupNumber());
+            }
+        }
     }
 
     public void handleTrainOnTransfer(Simulation simulation, TrainInfo train, Section section) {

src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/AtsTrainService.java

@@ -144,6 +144,9 @@ public class AtsTrainService {
             throw new SimulationException(SimulationExceptionType.Operation_Handle_FAIL,
                     String.format("不存在追踪的列车[%s]", groupNumber));
         }
+        TrainInfo trainInfo = repository.findSupervisedTrainByTrip(serviceNumber, tripNumber);
+        BusinessExceptionAssertEnum.OPERATION_NOT_SUPPORTED.assertNull(trainInfo,
+                String.format("服务号[%s]车次号[%s]的列车已经上线", serviceNumber, tripNumber));
         TripPlan tripPlan = repository.getTripPlan(serviceNumber, tripNumber);
         setPlanTrain(simulation, repository, supervisedTrain, tripPlan);
     }

src/main/java/club/joylink/rtss/simulation/cbtc/CI/CiApiService.java

@@ -262,6 +262,10 @@ public interface CiApiService {
 
     void sysHoldTrainCancel(Simulation simulation, String standCode);
 
+    void ibpHoldTrain(Simulation simulation, String standCode);
+
+    void ibpHoldTrainCancel(Simulation simulation, String standCode);
+
     void standHoldTrainCancelAll(Simulation simulation, String standCode);
 
     /**

src/main/java/club/joylink/rtss/simulation/cbtc/CI/CiApiServiceImpl.java

@@ -367,6 +367,18 @@ public class CiApiServiceImpl implements CiApiService {
         this.standService.cancelSysHoldTrain(simulation, stand);
     }
 
+    @Override
+    public void ibpHoldTrain(Simulation simulation, String standCode) {
+        Stand stand = simulation.getRepository().getByCode(standCode, Stand.class);
+        this.standService.ibpHoldTrain(simulation, stand);
+    }
+
+    @Override
+    public void ibpHoldTrainCancel(Simulation simulation, String standCode) {
+        Stand stand = simulation.getRepository().getByCode(standCode, Stand.class);
+        this.standService.cancelIbpHoldTrain(simulation, stand);
+    }
+
     @Override
     public void standHoldTrainCancelAll(Simulation simulation, String standCode) {
         Stand stand = simulation.getRepository().getByCode(standCode, Stand.class);

src/main/java/club/joylink/rtss/simulation/cbtc/CI/service/RouteService.java

@@ -1458,7 +1458,7 @@ public class RouteService {
                 .getListByType(MapElement.DeviceType.OVERLAP, RouteOverlap.class);
         for (RouteOverlap routeOverlap : overlapList) {
             Section section = stopMessage.getSection();
-            if (routeOverlap.isLock() && routeOverlap.isRouteLastSection(section)) {
+            if (/*routeOverlap.isLock() && */routeOverlap.isRouteLastSection(section)) {
                 // 是此延续保护的解锁区段，立即解锁
                 routeOverlap.releaseImmediately();
                 log.debug(String.format("收到列车停稳消息，[%s]延续保护[%s],触发区段[%s(%s)]立即解锁",

src/main/java/club/joylink/rtss/simulation/cbtc/CI/service/StandService.java

@@ -109,6 +109,27 @@ public class StandService {
             this.reopenSignal(simulation, stand);
         }
     }
+
+    public void ibpHoldTrain(Simulation simulation, Stand stand) {
+        stand.setIbpHoldTrain(true);
+        // 关闭出站信号机
+        Signal signal = stand.getSection().getSignalOf(stand.isRight());
+        if (Objects.nonNull(signal)) {
+            MapConfig config = simulation.getRepository().getConfig();
+            if (config.isStandHoldCloseLogicLight() || !signal.isLogicLight()) {
+                this.signalService.close(simulation, signal);
+            }
+        }
+    }
+
+    public void cancelIbpHoldTrain(Simulation simulation, Stand stand) {
+        stand.setIbpHoldTrain(false);
+        // 如果所有扣车都取消，开放出站信号机
+        if (!stand.isHoldTrain()) {
+            this.reopenSignal(simulation, stand);
+        }
+    }
+
     /**
      * 取消扣车
      *

src/main/java/club/joylink/rtss/simulation/cbtc/GroupSimulationService.java

@@ -15,12 +15,12 @@ import club.joylink.rtss.vo.LoginUserInfoVO;
 import club.joylink.rtss.vo.client.PageVO;
 import club.joylink.rtss.vo.client.fault.FaultRuleVO;
 import club.joylink.rtss.vo.client.map.DestinationCodeVO;
-import club.joylink.rtss.vo.client.map.MapVO;
-import club.joylink.rtss.vo.client.map.newmap.MapStationNewVO;
 import club.joylink.rtss.vo.client.runplan.PlanTripNumberVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanEChartsDataVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanVO;
 import club.joylink.rtss.vo.client.simulationv1.*;
+import club.joylink.rtss.vo.map.MapStationNewVO;
+import club.joylink.rtss.vo.map.MapVO;
 
 import java.time.LocalDateTime;
 import java.time.LocalTime;

src/main/java/club/joylink/rtss/simulation/cbtc/GroupSimulationServiceImpl.java

@@ -53,8 +53,6 @@ import club.joylink.rtss.vo.client.*;
 import club.joylink.rtss.vo.client.factory.SocketMessageFactory;
 import club.joylink.rtss.vo.client.fault.FaultRuleVO;
 import club.joylink.rtss.vo.client.map.DestinationCodeVO;
-import club.joylink.rtss.vo.client.map.MapVO;
-import club.joylink.rtss.vo.client.map.newmap.MapStationNewVO;
 import club.joylink.rtss.vo.client.project.ProjectDeviceVO;
 import club.joylink.rtss.vo.client.runplan.*;
 import club.joylink.rtss.vo.client.runplan.user.RunPlanParkingTimeVO;
@@ -64,6 +62,8 @@ import club.joylink.rtss.vo.client.script.ScriptVO;
 import club.joylink.rtss.vo.client.simulationv1.*;
 import club.joylink.rtss.vo.client.training.TrainingNewVO;
 import club.joylink.rtss.vo.client.userPermission.UserPermissionVO;
+import club.joylink.rtss.vo.map.MapStationNewVO;
+import club.joylink.rtss.vo.map.MapVO;
 import club.joylink.rtss.websocket.StompMessageService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/club/joylink/rtss/simulation/cbtc/ProjectJointSimulationServiceImpl.java

@@ -24,6 +24,7 @@ import club.joylink.rtss.vo.LoginUserInfoVO;
 import club.joylink.rtss.vo.client.map.MapVO;
 import club.joylink.rtss.vo.client.project.LwConfigVO;
 import club.joylink.rtss.vo.client.project.ProjectDeviceVO;
+import club.joylink.rtss.vo.map.MapVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;

src/main/java/club/joylink/rtss/simulation/cbtc/build/InterlockBuilder2.java

@@ -1,15 +1,13 @@
 package club.joylink.rtss.simulation.cbtc.build;
 
 import club.joylink.rtss.exception.BusinessExceptionAssertEnum;
-import club.joylink.rtss.services.IRunPlanDraftService;
 import club.joylink.rtss.services.draftData.RoutingGenerator;
 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.vo.client.map.newmap.*;
+import club.joylink.rtss.vo.map.*;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 

src/main/java/club/joylink/rtss/simulation/cbtc/build/MapDeviceBuilder.java

@@ -5,11 +5,7 @@ import club.joylink.rtss.simulation.cbtc.data.map.*;
 import club.joylink.rtss.simulation.cbtc.data.support.SectionPosition;
 import club.joylink.rtss.simulation.cbtc.data.support.StationTurnBackStrategyOption;
 import club.joylink.rtss.simulation.cbtc.data.vr.*;
-import club.joylink.rtss.vo.client.map.MapSwitchVO;
+import club.joylink.rtss.vo.map.*;
-import club.joylink.rtss.vo.client.map.MapTrainModelVO;
-import club.joylink.rtss.vo.client.map.MapTrainVO;
-import club.joylink.rtss.vo.client.map.MapZcVO;
-import club.joylink.rtss.vo.client.map.newmap.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;

src/main/java/club/joylink/rtss/simulation/cbtc/build/SimulationBuildParams.java

@@ -8,11 +8,11 @@ import club.joylink.rtss.vo.AccountVO;
 import club.joylink.rtss.vo.LoginUserInfoVO;
 import club.joylink.rtss.vo.client.CommandDefinitionVO;
 import club.joylink.rtss.vo.client.LessonVO;
-import club.joylink.rtss.vo.client.map.MapVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanVO;
 import club.joylink.rtss.vo.client.runplan.user.RunPlanParkingTimeVO;
 import club.joylink.rtss.vo.client.runplan.user.RunPlanRunlevelVO;
 import club.joylink.rtss.vo.client.schedulingNew.SchedulingPlanNewVO;
+import club.joylink.rtss.vo.map.MapVO;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;

src/main/java/club/joylink/rtss/simulation/cbtc/build/SimulationBuilder.java

@@ -8,10 +8,10 @@ import club.joylink.rtss.simulation.cbtc.data.plan.TerminalDeparturePlan;
 import club.joylink.rtss.simulation.cbtc.data.plan.TripPlan;
 import club.joylink.rtss.simulation.cbtc.data.support.RoutePath;
 import club.joylink.rtss.simulation.cbtc.data.vr.VirtualRealityDevice;
-import club.joylink.rtss.vo.client.map.MapVO;
-import club.joylink.rtss.vo.client.map.RealLineConfigVO;
 import club.joylink.rtss.vo.client.runplan.RunPlanVO;
 import club.joylink.rtss.vo.client.schedulingNew.SchedulingPlanNewVO;
+import club.joylink.rtss.vo.map.MapVO;
+import club.joylink.rtss.vo.map.RealLineConfigVO;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;

src/main/java/club/joylink/rtss/simulation/cbtc/build/UserConfigDataBuilder.java

@@ -5,11 +5,11 @@ import club.joylink.rtss.simulation.cbtc.data.map.Section;
 import club.joylink.rtss.simulation.cbtc.data.map.Station;
 import club.joylink.rtss.simulation.cbtc.data.map.StationParkTime;
 import club.joylink.rtss.simulation.cbtc.data.map.StationRunLevel;
-import club.joylink.rtss.vo.client.map.MapVO;
-import club.joylink.rtss.vo.client.map.newmap.MapStationParkingTimeVO;
-import club.joylink.rtss.vo.client.map.newmap.MapStationRunLevelVO;
 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.MapVO;
 import org.springframework.util.CollectionUtils;
 
 import java.util.HashMap;

src/main/java/club/joylink/rtss/simulation/cbtc/command/CommandBO.java

@@ -192,8 +192,8 @@ public class CommandBO {
                         return buildReleaseEBStep(train);
                     return driveStep;
                 } else { //如果列车已经停到目标位置
-                    if (!DriveMode.AM.equals(train.getDriveMode()))
+//                    if (!DriveMode.AM.equals(train.getDriveMode()))
-                        return getStepOfRm2BmAndOpenAto(command);
+//                        return getStepOfRm2BmAndOpenAto(command);
                     command.getTargetMember().setCommand(null);
                     return null;
                 }
@@ -292,17 +292,18 @@ public class CommandBO {
                 boolean stopCorrectly = train.isStopAtThePosition(driveStep.getTargetPosition());
                 if (stopCorrectly) { //如果列车已经停到目标位置
                     driveStep.finish();
-                    if (RunLevel.ITC.equals(train.getRunLevel()) || RunLevel.CBTC.equals(train.getRunLevel())) {
+                    command.getTargetMember().setCommand(null);
-                        Step upgradeStep = getStepOfRm2BmAndOpenAtoWhileStopAtStopPosition(command);
+//                    if (RunLevel.ITC.equals(train.getRunLevel()) || RunLevel.CBTC.equals(train.getRunLevel())) {
-                        if (upgradeStep != null) {
+//                        Step upgradeStep = getStepOfRm2BmAndOpenAtoWhileStopAtStopPosition(command);
-                            return upgradeStep;
+//                        if (upgradeStep != null) {
-                        } else if (train.isAtoOn()) {
+//                            return upgradeStep;
-                            command.getTargetMember().setCommand(null);
+//                        } else if (train.isAtoOn()) {
-                            return buildAtoTurnDirectionStep();
+//                            command.getTargetMember().setCommand(null);
-                        }
+//                            return buildAtoTurnDirectionStep();
-                    } else {
+//                        }
-                        command.getTargetMember().setCommand(null);
+//                    } else {
-                    }
+//                        command.getTargetMember().setCommand(null);
+//                    }
                 } else {
                     if (!DriveMode.RM.equals(train.getDriveMode())) {
                         return buildDriverDriveModeChangeOperationStep(train.getGroupNumber(), DriveMode.RM);