From 7aabe2822b890dafc8200386a60d502491b56fae Mon Sep 17 00:00:00 2001 From: tiger_zhou <123456> Date: Mon, 16 Jan 2023 10:46:10 +0800 Subject: [PATCH] =?UTF-8?q?training2=20=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rtss/simulation/cbtc/GroupSimulationServiceImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/GroupSimulationServiceImpl.java b/src/main/java/club/joylink/rtss/simulation/cbtc/GroupSimulationServiceImpl.java index 5f1f8e747..d2bba1a27 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/GroupSimulationServiceImpl.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/GroupSimulationServiceImpl.java @@ -22,6 +22,7 @@ import club.joylink.rtss.simulation.cbtc.ATS.data.AtsAlarm; import club.joylink.rtss.simulation.cbtc.ATS.data.SimulationLog; import club.joylink.rtss.simulation.cbtc.ATS.operation.AtsOperationDispatcher; import club.joylink.rtss.simulation.cbtc.ATS.service.AtsTrainLoadService; + import club.joylink.rtss.simulation.cbtc.build.SimulationBuildParams; import club.joylink.rtss.simulation.cbtc.command.CommandBO; import club.joylink.rtss.simulation.cbtc.command.CommandExecuteService; @@ -37,9 +38,11 @@ import club.joylink.rtss.simulation.cbtc.data.map.MayOutOfOrderDevice; import club.joylink.rtss.simulation.cbtc.data.plan.TripPlan; import club.joylink.rtss.simulation.cbtc.data.storage.StorageSimulation; import club.joylink.rtss.simulation.cbtc.data.vo.RealDeviceVO; + import club.joylink.rtss.simulation.cbtc.data.vo.SimulationVO; import club.joylink.rtss.simulation.cbtc.data.vr.VirtualRealityTrain; import club.joylink.rtss.simulation.cbtc.device.real.modbustcp.SimulationRealDeviceConnectManager; + import club.joylink.rtss.simulation.cbtc.device.real.modbustcp.device.RealDeviceConfig; import club.joylink.rtss.simulation.cbtc.event.*; import club.joylink.rtss.simulation.cbtc.exception.SimulationException; @@ -1085,8 +1088,8 @@ public class GroupSimulationServiceImpl implements GroupSimulationService { @Override public boolean hasPermission(AccountVO accountVO, Long mapId, String prdType) { MapVO mapDetail = iMapService.getMapDetail(mapId); - if (Project.CGY.name().equals(mapDetail.getProjectCode()) || - Project.ZZWW.name().equals(mapDetail.getProjectCode())) { //成都工业,郑州共赢所有资源免费 + ProjectVO projectVO = projectService.queryLoginProjectByCode(mapDetail.getProjectCode()); + if (projectVO.isFreeSource()) { //成都工业,郑州共赢所有资源免费 return true; } List ups = iUserPermissionService.getSimulationUserPermission(accountVO, mapId, prdType);