training2 合并

This commit is contained in:
tiger_zhou 2023-01-16 10:46:10 +08:00
parent f85636942d
commit 7aabe2822b

View File

@ -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<UserPermissionVO> ups = iUserPermissionService.getSimulationUserPermission(accountVO, mapId, prdType);