joylink/rt-sim-training-service
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 10 Wiki Activity

Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1

Browse Source
This commit is contained in:
xzb 2022-09-02 18:04:45 +08:00
commit 71d735a7cb
16 changed files with 653 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/club/joylink/rtss/exception/BusinessExceptionAssertEnum.java
View File

@ -32,7 +32,7 @@ public enum BusinessExceptionAssertEnum implements BusinessExceptionAssert {
OPERATION_REPEAT(10016, "operation repeat"),
SIMULATION_EXCEPTION_FOR_SHOW(10017, ""), //错误信息用于展示给仿真用户
OPERATION_FAIL(10018, "操作失败"),
STATION_DETAIL_NOT_FOUND_RD_PLAN_ITEM(10019,"站细卡控未找到对应的接发车计划"),
DATA_ERROR(11000, "data error"),
REPEAT_RUN_PLAN_FROM_CTC_UPDATE_DATA(11200,"repeat run plan"),

23
src/main/java/club/joylink/rtss/services/training2/Training2DraftPublishService.java
View File

@ -9,6 +9,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
@ -18,7 +19,7 @@ import java.util.List;
@Slf4j
public class Training2DraftPublishService {
@Autowired
private DraftTraining2DAO trainingDao;
private DraftTraining2DAO trainingDao;
@Autowired
private PublishedTraining2DAO publishedDao;
@ -26,22 +27,22 @@ public class Training2DraftPublishService {
* 草稿发布
*/
@Transactional(rollbackFor = Exception.class)
public void draftPublish(TrainingDraftPublishReqVo req,Long userId){
Long draftId=Long.valueOf(req.getDraftId());
DraftTraining2Example dtExample=new DraftTraining2Example();
public void draftPublish(TrainingDraftPublishReqVo req, Long userId) {
Long draftId = Long.valueOf(req.getDraftId());
DraftTraining2Example dtExample = new DraftTraining2Example();
dtExample.createCriteria().andCreatorIdEqualTo(userId).andIdEqualTo(draftId);
List<DraftTraining2WithBLOBs> dtFinds= this.trainingDao.selectByExampleWithBLOBs(dtExample);
BusinessExceptionAssertEnum.SYSTEM_EXCEPTION.assertTrue(null!=dtFinds&&!dtFinds.isEmpty(),"实训草稿不存在");
DraftTraining2WithBLOBs draft = dtFinds.get(0);
List<DraftTraining2WithBLOBs> dtFinds = this.trainingDao.selectByExampleWithBLOBs(dtExample);
BusinessExceptionAssertEnum.SYSTEM_EXCEPTION.assertTrue(null != dtFinds && !dtFinds.isEmpty(), "实训草稿不存在");
DraftTraining2WithBLOBs draft = dtFinds.get(0);
//
PublishedTraining2WithBLOBs pub = Training2Convertor.convertFrom(draft);
//根据要发布的草稿名称来查找已发布的实训
//如果以有同名的则会被覆盖
PublishedTraining2Example ptExample=new PublishedTraining2Example();
ptExample.createCriteria().andNameEqualTo(draft.getName());
List<PublishedTraining2> ptFinds= this.publishedDao.selectByExample(ptExample);
PublishedTraining2Example ptExample = new PublishedTraining2Example();
ptExample.createCriteria().andNameEqualTo(draft.getName()).andMapIdEqualTo(draft.getMapId());
List<PublishedTraining2> ptFinds = this.publishedDao.selectByExample(ptExample);
//
if(null!=ptFinds&&!ptFinds.isEmpty()){//已发布实训存在时则直接删除
if (null != ptFinds && !ptFinds.isEmpty()) {//已发布实训存在时则直接删除
this.publishedDao.deleteByExample(ptExample);
}
//发布

2
src/main/java/club/joylink/rtss/services/training2/Training2DraftService.java
View File

@ -54,7 +54,7 @@ public class Training2DraftService {
public CreateTraining2RspVo createTraining(CreateTraining2ReqVo req, AccountVO user) {
//校验是否已经有同名的实训
DraftTraining2Example example = new DraftTraining2Example();
example.createCriteria().andNameEqualTo(req.getName());
example.createCriteria().andCreatorIdEqualTo(user.getId()).andNameEqualTo(req.getName()).andMapIdEqualTo(req.getMapId());
List<DraftTraining2> check = this.trainingDao.selectByExample(example);
BusinessExceptionAssertEnum.SYSTEM_EXCEPTION.assertCollectionEmpty(check, "实训已经存在");
//

234
src/main/java/club/joylink/rtss/services/training2/Training2Service.java
View File

@ -34,6 +34,7 @@ import org.springframework.util.StringUtils;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.Semaphore;
import java.util.function.Consumer;
@Service
@ -66,71 +67,44 @@ public class Training2Service {
@Autowired
private StompMessageService stompMessageService;
/**
* 完成步骤接口信号量
*/
private Semaphore completeStepSemaphore = new Semaphore(1);
/**
* 完成操作接口信号量
*/
private Semaphore completeOperationSemaphore = new Semaphore(1);
public void run(Simulation simulation) {
Training2 training2 = simulation.getTraining2();
if (training2 == null || !training2.isStarted() || training2.isFinish()) {
return;
}
// 获取运行步骤
Step2 step = training2.getCurrentRunStep();
if (step == null) { // 步骤已经运行完毕
training2.finish();
// 发送实训完成消息
sendTrainingFinish(training2, simulation);
Step2 step = getNextStepAndCheckTrainingStatus(training2, simulation);
if (step == null) {
return;
}
// 步骤是否已经触发
// 没有触发则检查触发状态，如果可以触发则继续，不能触发则返回
if (!Step2.StepStatus.isAlreadyTrigger(step.getStepStatus()) && !step.doTriggerVail()) {
// 尝试触发步骤
if (!tryTriggerStep(step, simulation)) {
return;
}
// 发送步骤提示信息
if (!step.isPrompt()) {
step.setPrompt(true); // 标识已发送过消息
sendStepTips(step, simulation);
}
// 获取步骤中未完成的操作
Operation2 operation2 = step.getCurrentRunOperation();
// 操作全部完成的情况，检查步骤完成条件
Operation2 operation2 = getOperationAndTryTrigger(step, simulation);
if (operation2 == null) {
// TODO 后续判断步骤完成情况
checkTrainStepCompletion(step, simulation);
return;
}
// 操作是否已触发
// 没有触发则检查触发状态，如果可以触发则继续，不能触发则返回(同步骤)
if (!Step2.StepStatus.isAlreadyTrigger(operation2.getStatus()) && !operation2.doTriggerVail()) {
// 尝试执行操作
if (!tryDoOperation(simulation, step, operation2)) {
return;
}
boolean isRobot = step.getSimulationMember().isRobot(); // 角色是否是机器人
boolean isClient = operation2 instanceof Operation2.ClientOperation2; // 客户端操作
// 未操作过
if (Step2.StepStatus.isUndo(operation2.getStatus())) {
if (isRobot) {
if (isClient) { // 客户端操作
operation2.doOperated();
} else { // 仿真操
Operation2.SimOperation2 simOperation2 = (Operation2.SimOperation2) operation2;
atsOperationDispatcher.execute(simulation, step.getSimulationMember(),
simOperation2.getOperationType().name(), simOperation2.getParams());
}
} else { // 非机器人，暂停仿真等待用户操作
pauseOrStartSimulation(simulation, true);
return;
}
}
// 运行阶段，判断是否完成
if (Step2.StepStatus.isRunning(operation2.getStatus())) {
boolean completion = operation2.doCompletion();
// 发送操作完成信息
sendOperationFinish(operation2, simulation);
// 如果是最后一步，直接检查步骤有没有完成
if (step.getOperations().indexOf(operation2) == (step.getOperations().size() - 1) && completion) {
checkTrainStepCompletion(step, simulation);
}
}
// 操作运行阶段，判断是否完成
tryCompleteOperation(simulation, step, operation2);
}
/**
* 预览实训草稿
*/
@ -272,21 +246,32 @@ public class Training2Service {
if (Objects.equals(user.getId(), step.getSimulationMember().getId())) {
throw new SimulationException(SimulationExceptionType.Invalid_Operation, "无权限操作");
}
boolean result = true;
for (Operation2 operation2 : step.getOperations()) {
if (operation2 instanceof Operation2.ClientOperation2) { // 前端操作，直接判断结果
operation2.doOperated();
operation2.doCompletion();
} else {
result = false;
break;
try {
if (!step.isCompletion()) {
completeStepSemaphore.acquire(); // 控制多次请求
if (!step.isCompletion()) { //二次判断
boolean result = true;
for (Operation2 operation2 : step.getOperations()) {
if (operation2 instanceof Operation2.ClientOperation2) { // 前端操作，直接判断结果
operation2.doOperated();
operation2.doCompletion();
} else {
result = false;
break;
}
}
if (result) {
checkStepCompletionAndSendNext(step, simulation); // 直接检查步骤是否完成
}
// 恢复前端运行
pauseOrStartSimulation(simulation, false);
}
}
} catch (InterruptedException e) {
throw new RuntimeException(e);
} finally {
completeStepSemaphore.release();
}
if (result) {
checkTrainStepCompletion(step, simulation); // 直接检查步骤是否完成
}
// 恢复前端运行
pauseOrStartSimulation(simulation, false);
return 1;
}
@ -316,9 +301,21 @@ public class Training2Service {
if (operation == null) {
throw new SimulationException(SimulationExceptionType.Invalid_Operation, "不存在操作");
}
operation.doOperated();
// 恢复前端运行
pauseOrStartSimulation(simulation, false);
try {
if (!Step2.StepStatus.isCompletion(operation.getStatus())) {
completeOperationSemaphore.acquire();
if (!Step2.StepStatus.isCompletion(operation.getStatus())) {
operation.doOperated(); //操作过后
tryCompleteOperation(simulation, step, operation); // 尝试完成
// 恢复前端运行
pauseOrStartSimulation(simulation, false);
}
}
} catch (InterruptedException e) {
throw new RuntimeException(e);
} finally {
completeOperationSemaphore.release();
}
return 1;
}
@ -492,6 +489,117 @@ public class Training2Service {
sendStepFinish(step, simulation);
}
/**
* 获取实训下一步未执行的步骤，如果实训已结束则返回null
*/
private Step2 getNextStepAndCheckTrainingStatus(Training2 training2, Simulation simulation) {
// 获取运行步骤
Step2 nextStep = training2.getCurrentRunStep();
if (nextStep == null) { // 步骤已经运行完毕
training2.finish();
// 发送实训完成消息
sendTrainingFinish(training2, simulation);
return null;
}
return nextStep;
}
/**
* 尝试触发步骤，如果触发返回true，可以继续，未触发返回false
*/
private boolean tryTriggerStep(Step2 step, Simulation simulation) {
// 步骤是否已经触发
// 没有触发则检查触发状态，如果可以触发则继续，不能触发则返回
if (!Step2.StepStatus.isAlreadyTrigger(step.getStepStatus()) && !step.doTriggerVail()) {
return false;
}
// 发送步骤提示信息
if (!step.isPrompt()) {
step.setPrompt(true); // 标识已发送过消息
sendStepTips(step, simulation);
}
return true;
}
/**
* 获取步骤中操作，并尝试触发
*/
private Operation2 getOperationAndTryTrigger(Step2 step, Simulation simulation) {
// 获取步骤中未完成的操作
Operation2 operation2 = step.getCurrentRunOperation();
// 操作全部完成的情况，检查步骤完成条件
if (operation2 == null) {
// TODO 后续判断步骤完成情况
checkTrainStepCompletion(step, simulation);
return null;
}
// 操作是否已触发
// 没有触发则检查触发状态，如果可以触发则继续，不能触发则返回(同步骤)
if (!Step2.StepStatus.isAlreadyTrigger(operation2.getStatus()) && !operation2.doTriggerVail()) {
return null;
}
return operation2;
}
/**
* 尝试操作动作
*/
private boolean tryDoOperation(Simulation simulation, Step2 step, Operation2 operation2) {
boolean isRobot = step.getSimulationMember().isRobot(); // 角色是否是机器人
boolean isClient = operation2 instanceof Operation2.ClientOperation2; // 客户端操作
// 未操作过
if (Step2.StepStatus.isUndo(operation2.getStatus())) {
if (isRobot) {
if (isClient) { // 客户端操作
operation2.doOperated();
} else { // 仿真操
Operation2.SimOperation2 simOperation2 = (Operation2.SimOperation2) operation2;
atsOperationDispatcher.execute(simulation, step.getSimulationMember(),
simOperation2.getOperationType().name(), simOperation2.getParams());
}
return true;
} else { // 非机器人，暂停仿真等待用户操作
pauseOrStartSimulation(simulation, true);
return false;
}
}
return true;
}
/**
* 尝试完成操作
*/
private void tryCompleteOperation(Simulation simulation, Step2 step, Operation2 operation2) {
if (Step2.StepStatus.isRunning(operation2.getStatus())) {
boolean completion = operation2.doCompletion();
// 发送操作完成信息
sendOperationFinish(operation2, simulation);
// 如果是最后一步，直接检查步骤有没有完成
if (step.getOperations().indexOf(operation2) == (step.getOperations().size() - 1) && completion) {
checkStepCompletionAndSendNext(step, simulation);
}
}
}
/**
* 直接完成并尝试触发下一步
*/
private void checkStepCompletionAndSendNext(Step2 step, Simulation simulation) {
boolean result = step.doCompletionVail();
if (result) {
// 发送步骤完成信息
sendStepFinish(step, simulation);
// 获取运行步骤
Step2 nextStep = getNextStepAndCheckTrainingStatus(simulation.getTraining2(), simulation);
if (nextStep == null) {
return;
}
if (tryTriggerStep(nextStep, simulation)) {
getOperationAndTryTrigger(nextStep, simulation);
}
}
}
/**
* 暂停、恢复实训
*/

10
src/main/java/club/joylink/rtss/simulation/cbtc/CTC/data/CascoControl.java
View File

@ -8,15 +8,25 @@ import lombok.NoArgsConstructor;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
@Data
@NoArgsConstructor
public class CascoControl {
private Simulation simulation;
private Station station;
private Route route;
private List<String> errorList = new ArrayList<>();
private String tripNum;
// private boolean force;
public CascoControl(Simulation simulation, Station station, Route route, String tripNum/*,Boolean force*/) {
this.simulation = simulation;
this.station = station;
this.route = route;
this.tripNum = tripNum;
// this.force = Objects.isNull(force) ? false : force.booleanValue();
}
public void addErrorMsg(String msg){
this.errorList.add(msg);

10
src/main/java/club/joylink/rtss/simulation/cbtc/CTC/data/CtcEffectRepository.java
View File

@ -73,6 +73,14 @@ public class CtcEffectRepository {
*/
private final Map<String,CtcEffectRepository.RegularTrainLineRepository> updateReguarTrainLineMap = new ConcurrentHashMap<>();
/**
* 股道更新区域（从生效区来的数据）
*/
private final Map<String, StationTrackSectionRepository> updateStationTrackSectionMap = new ConcurrentHashMap<>();
/**
* 出入口更新区域（从生效区来的数据）
*/
private final Map<String, CtcEffectRepository.StationDoorRepository> updateDoorMap = new ConcurrentHashMap<>();
/**
* 获取生效区的运行计划
*
@ -576,5 +584,7 @@ public class CtcEffectRepository {
this.doorRepository.clear();
this.regularTrainLineMap.clear();
updateReguarTrainLineMap.clear();
updateStationTrackSectionMap.clear();
this.updateDoorMap.clear();
}
}

11
src/main/java/club/joylink/rtss/simulation/cbtc/CTC/data/TrackSection.java
View File

@ -11,7 +11,7 @@ import lombok.Setter;
@Setter
@Getter
@NoArgsConstructor
public class TrackSection {
public class TrackSection implements Cloneable {
/**
* 编码
*/
@ -122,4 +122,13 @@ public class TrackSection {
public enum StandType {
NO, LOW, HIGH
}
public TrackSection clone() {
try {
return (TrackSection) super.clone();
} catch (CloneNotSupportedException e) {
e.printStackTrace();
}
return null;
}
}

2
src/main/java/club/joylink/rtss/simulation/cbtc/CTC/operation/fck/CtcManageIOGateOperateHandler.java
View File

@ -46,7 +46,7 @@ public class CtcManageIOGateOperateHandler {
@OperateHandlerMapping(type = Operation.Type.STATION_IO_GATE_PUBLISH)
public void publist(Simulation simulation, String stationCode){
ctcManageService.publishData(simulation, CtcRepository.CtcFZKType.STATION_DETAIL,stationCode);
ctcManageService.publishData(simulation, CtcRepository.CtcFZKType.IO_GATE,stationCode);
}
}

16
src/main/java/club/joylink/rtss/simulation/cbtc/CTC/param/CtcRunPlanParam.java
View File

@ -232,6 +232,7 @@ public class CtcRunPlanParam implements Cloneable {
* 运行计划车次信息
* private String tripNumber;
*/
this.tripNumber = tl.getArriveTipNum();
/**
@ -449,6 +450,21 @@ public class CtcRunPlanParam implements Cloneable {
return p;
}
/* public boolean getTrackDiscordant(){
if(Objects.isNull(trackDiscordant)){
return false;
}
return this.trackDiscordant.booleanValue();
}
public boolean getEntryOutDiscordant(){
if(Objects.isNull(entryOutDiscordant)){
return false;
}
return this.entryOutDiscordant.booleanValue();
}*/
/**
* 初始化车次信息
*/

22
src/main/java/club/joylink/rtss/simulation/cbtc/CTC/service/CTCService.java
View File

@ -2,10 +2,7 @@ package club.joylink.rtss.simulation.cbtc.CTC.service;
import club.joylink.rtss.exception.BusinessExceptionAssertEnum;
import club.joylink.rtss.simulation.cbtc.CI.CiApiService;
import club.joylink.rtss.simulation.cbtc.CTC.data.CtcEffectRepository;
import club.joylink.rtss.simulation.cbtc.CTC.data.CtcRepository;
import club.joylink.rtss.simulation.cbtc.CTC.data.CtcStationRunPlanLog;
import club.joylink.rtss.simulation.cbtc.CTC.data.RouteSequence;
import club.joylink.rtss.simulation.cbtc.CTC.data.*;
import club.joylink.rtss.simulation.cbtc.Simulation;
import club.joylink.rtss.simulation.cbtc.data.map.*;
import org.springframework.beans.factory.annotation.Autowired;
@ -13,6 +10,7 @@ import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import java.time.LocalTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
@ -23,7 +21,8 @@ import java.util.stream.Collectors;
public class CTCService {
@Autowired
private CiApiService ciApiService;
@Resource
private CascoControlService cascoControlService;
/**
* 创建了新的运行计划item
*/
@ -161,7 +160,12 @@ public class CTCService {
line.setAutoTrigger(trigger);
}
private List<String> cascoControl(CascoControl cc,boolean force){
if(Objects.equals(true,force)){
return Collections.emptyList();
}
return this.cascoControlService.checkCascoControlRoute(cc);
}
/**
*
* @param simulation
@ -179,6 +183,12 @@ public class CTCService {
List<String> conflictInfo = new ArrayList<>();
CtcRepository ctcRepository = simulation.getCtcRepository();
CascoControl cc = new CascoControl(simulation,station,route,tripNumber);
List<String> errCCMsg = this.cascoControl(cc,Objects.isNull(force) ? false:force.booleanValue());//站细卡控
if(Objects.equals(false,CollectionUtils.isEmpty(errCCMsg))){
//站细检测错误的信息
return errCCMsg;
}
if (StringUtils.hasText(tripNumber) && !Objects.equals(true, force)) { //列车进路防错办
List<RouteSequence.Line> lines = ctcRepository.findRouteSequenceLines(station.getCode(), tripNumber);
if (!CollectionUtils.isEmpty(lines)) {

348
src/main/java/club/joylink/rtss/simulation/cbtc/CTC/service/CascoControlService.java
View File

@ -1,20 +1,22 @@
package club.joylink.rtss.simulation.cbtc.CTC.service;
import club.joylink.rtss.simulation.cbtc.CTC.data.CascoControl;
import club.joylink.rtss.simulation.cbtc.CTC.data.CtcEffectRepository;
import club.joylink.rtss.simulation.cbtc.CTC.data.CtcRepository;
import club.joylink.rtss.simulation.cbtc.CTC.data.CtcStationRunPlanLog;
import club.joylink.rtss.exception.BusinessException;
import club.joylink.rtss.simulation.cbtc.CI.data.StationDirection;
import club.joylink.rtss.simulation.cbtc.CTC.data.*;
import club.joylink.rtss.simulation.cbtc.Simulation;
import club.joylink.rtss.simulation.cbtc.data.map.Station;
import club.joylink.rtss.simulation.cbtc.data.map.Route;
import club.joylink.rtss.simulation.cbtc.data.map.Section;
import com.google.common.base.Strings;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.function.Function;
import java.util.stream.Collectors;
@Service
@Slf4j
@ -22,66 +24,304 @@ public class CascoControlService {
/**
*
* @param cc
* @param cc 卡控参数
* @return
*/
public List<String> checkCascoControlRoute(CascoControl cc){
Station station = cc.getStation();
Simulation simulation = cc.getSimulation();
String stationCode = station.getCode();
CtcRepository ctcRepository = simulation.getCtcRepository();
CtcEffectRepository effectRepository = ctcRepository.getCtcEffectRepository();
Map<String, CtcStationRunPlanLog> runPlanLogMap = simulation.getCtcRepository().getSimulationRunPlanMap().get(stationCode);
Optional<CtcStationRunPlanLog> runPlanLogOptional = null;
if(Objects.nonNull(runPlanLogMap) && !runPlanLogMap.isEmpty()){
runPlanLogOptional = this.checkForRunPlan(cc);
CheckData checkData = this.findCheckData(cc,simulation.getCtcRepository().getCtcEffectRepository());
if(checkData.isJustReturn()){
//说明没有行车计划需要立刻返回
return Collections.emptyList();
}
// List<CtcStationRunPlanLog> allRunPlanLogList = runPlanLogMap.values().stream().filter(d->d.getChangeType() == null && d.isSign()).collect(Collectors.toList());
CtcEffectRepository.StationDoorRepository doorRepository = effectRepository.getDoorRepository().get(stationCode);
if(Objects.nonNull(doorRepository)){
if(runPlanLogOptional.isPresent()){
}
if(Objects.equals(false,StringUtils.isEmpty(cc.getErrorList()))){
return cc.getErrorList();
}
CtcEffectRepository.StationTrackSectionRepository stationTrackRepository = effectRepository.getStationTrackSectionMap().get(stationCode);
if(Objects.nonNull(stationTrackRepository)){
}
return null;
this.checkRegularTrainLine(checkData,cc.getErrorList());
this.doorCheckDetail(checkData,cc.getErrorList());
this.checkStationTrackDetail(checkData,cc.getErrorList());
return cc.getErrorList();
}
private Optional<CtcStationRunPlanLog> checkForRunPlan(/*List<CtcStationRunPlanLog> allRunPlanLogList,*/CascoControl cc){
CtcStationRunPlanLog runPlanLog = cc.getSimulation().getCtcRepository().getRunPlan(cc.getStation().getCode(),cc.getTripNum());
if(Objects.isNull(runPlanLog)){
cc.addErrorMsg(String.format("未在计划中找到对应的车次[%s]",cc.getTripNum()));
}
if(!Objects.isNull(runPlanLog.getChangeType()) && !runPlanLog.isSign()){
cc.addErrorMsg(String.format("未在计划中找到对应的车次[%s]",cc.getTripNum()));
}
return Optional.of(runPlanLog);
/*Map<String,CtcStationRunPlanLog> tripNumMap = allRunPlanLogList.stream().collect(Collectors.toMap(CtcStationRunPlanLog::getTripNumber, Function.identity(),(v1,v2)->v1));
CtcStationRunPlanLog runPlanLog = tripNumMap.get(cc.getTripNum());
if(Objects.isNull(runPlanLog)){
cc.addErrorMsg(String.format("未在计划中找到对应的车次[%s]",cc.getTripNum()));
}*/
}
private void checkCascoForStationTrack(CtcEffectRepository.StationTrackSectionRepository stationTrackRepository){
/**
* 获取检测固定径路，出入口，股道必要的参数数据
* @param cc
* @param effectRepository
* @return
*/
private CheckData findCheckData(CascoControl cc,CtcEffectRepository effectRepository){
String stationCode = cc.getStation().getCode();
CheckData data = new CheckData();
boolean isDepart = cc.getRoute().getType() == Route.Type.DEPARTURE;
data.setDepart(isDepart);
CtcStationRunPlanLog runPlanLog;
try{
//在TDCS界面创建进路如果车次号没有在计划中就直接返回，先按照之前的逻辑运行
runPlanLog = this.checkForRunPlan(cc);
}catch (BusinessException e){
log.error(e.getMessage() + " errorCode:[{}]",e.getCode());
data.setJustReturn(true);
return data;
}
CtcStationRunPlanLog.RunPlanItem runPlan = this.findRunPlanFromPlan(isDepart,runPlanLog);
if(Objects.isNull(runPlan)){
String depart = data.departToChar();
String msg = String.format("未找到行车计划的接发车计划 车站[%s] 车次[%s] [%s]", runPlanLog.getStation().getCode(), runPlanLog.getTripNumber(),depart);
log.error(msg);
cc.addErrorMsg(msg);
return data;
}
CtcEffectRepository.StationDoorRepository doorRepository = effectRepository.getUpdateDoorMap().get(stationCode);
CtcEffectRepository.StationTrackSectionRepository stationTrackRepository = effectRepository.getUpdateStationTrackSectionMap().get(stationCode);
CtcEffectRepository.RegularTrainLineRepository regularTrainLineRepository = effectRepository.getUpdateReguarTrainLineMap().get(stationCode);
if(Objects.isNull(doorRepository)){
String msg = String.format("未找到对应的出入口站细数据,车站[%s]",stationCode);
log.error(msg);
cc.addErrorMsg(msg);
return data;
}
if(Objects.isNull(stationTrackRepository)){
String msg = String.format("未找到对应的股道站细数据,车站[%s]",stationCode);
log.error(msg);
cc.addErrorMsg(msg);
return data;
}
data.setRunPlanLog(runPlanLog);
data.setRunPlan(runPlan);
data.setStationTrackRepository(stationTrackRepository);
data.setDoorRepository(doorRepository);
data.setRegularTrainLineRepository(regularTrainLineRepository);
return data;
}
private boolean trackAndDoor(Boolean d){
return Objects.isNull(d) ? false: d.booleanValue();
}
private void checkCascoForDoor(CtcEffectRepository.StationDoorRepository doorRepository,CtcStationRunPlanLog runPlanLog){
CtcStationRunPlanLog.RunPlanItem departPlan = runPlanLog.getDepartRunPlan();
CtcStationRunPlanLog.RunPlanItem arrivePlan = runPlanLog.getArriveRunPlan();
if(Objects.nonNull(departPlan)){
/**
* 根据接发车获取行车计划的接发车计划
* @param isDepart
* @param runPlanLog
* @return
*/
private CtcStationRunPlanLog.RunPlanItem findRunPlanFromPlan(boolean isDepart,CtcStationRunPlanLog runPlanLog){
CtcStationRunPlanLog.RunPlanItem runPlan = runPlanLog.getArriveRunPlan();
if(isDepart){
runPlan = runPlanLog.getDepartRunPlan();
}
if(Objects.nonNull(arrivePlan)){
return runPlan;
}
/**
* 根据车辆计划（接发车，车次）查找对应更新区的车辆固定径路数据
* @param checkData
* @param errMsg
*/
private void checkRegularTrainLine(CheckData checkData,List<String> errMsg){
CtcEffectRepository.RegularTrainLineRepository regularTrainLineRepository = checkData.getRegularTrainLineRepository();
if(Objects.isNull(regularTrainLineRepository) || Objects.equals(true,CollectionUtils.isEmpty(errMsg))){
log.error("未找到固定径路的数据车站[{}],车次[{}],方向[{}]",checkData.getRunPlanLog().getStation().getCode(),checkData.getRunPlan().getTripNumber(),checkData.departToChar());
return;
}
//根据接发车获取对应的列车固定径路的数据
final String tripNum = checkData.runPlan.getTripNumber();
RegularTrainLine rtl = regularTrainLineRepository.getDataMap().values().stream().filter(d->{
String tmpNum = d.getArriveTipNum();
if(checkData.isDepart()){
tmpNum = d.getLeaveTipNum();
}
return Objects.equals(tripNum,tmpNum);
}).findFirst().orElse(null);
if(Objects.isNull(rtl)){
log.error("未找到列车的固定径路 车站[{}],对应车次[{}],方向[{}]",checkData.runPlan.getStation().getCode(),tripNum,checkData.departToChar());
return;
}
StationDirection sd = rtl.getEnter();
if(checkData.isDepart()){
sd = rtl.getOut();
}
boolean trackSectionEQ = Objects.equals(checkData.runPlan.getTrackSection().getCode(),rtl.getMasterStand().getCode());
boolean doorEQ = Objects.equals(checkData.runPlan.getStationDirection().getCode(),sd.getCode());
//检测运行股道与固定径路是否一致
if(Objects.equals(false,trackAndDoor(checkData.runPlanLog.getTrackDiscordant())) && Objects.equals(false,trackSectionEQ)){
//股道不一致检测
log.error("检测股道是否一致 计划车站[{}],计划股道[{}],径路车站[{}],径路股道[{}],车次[{}],方向[{}],固定径路[{}]",checkData.runPlan.getStation().getCode()
,checkData.runPlan.getTrackSection().getCode(),rtl.getStation().getCode(),rtl.getMasterStand().getCode(),checkData.runPlan.getTripNumber(),checkData.departToChar(),rtl.getCode());
errMsg.add(String.format("运行股道固定径路[%s]不一致",rtl.getMasterStand().getName()));
}
//检测出入口与固定径路是否一致
if(Objects.equals(false,trackAndDoor(checkData.runPlanLog.getEntryOutDiscordant())) && Objects.equals(false,doorEQ)){
//出入口不一致检测
log.error("检测出入口是否一致 计划车站[{}],计划股道[{}],径路车站[{}],径路股道[{}],车次[{}],方向[{}],固定径路[{}]",checkData.runPlan.getStation().getCode()
,checkData.runPlan.getTrackSection().getCode(),rtl.getStation().getCode(),rtl.getMasterStand().getCode(),checkData.runPlan.getTripNumber(),checkData.departToChar(),rtl.getCode());
errMsg.add(String.format("运行出入口固定径路[%s]不一致",sd.getName()));
}
}
/**
* 获取对应的执行计划
* @param cc
* @return
*/
private CtcStationRunPlanLog checkForRunPlan(CascoControl cc){
String stationCode = cc.getStation().getCode();
String tripNum = cc.getTripNum();
CtcStationRunPlanLog runPlanLog = cc.getSimulation().getCtcRepository().getRunPlan(stationCode,tripNum);
return runPlanLog;
}
/**
* 检测接发计划与股道接发车方向是否一致
* @param checkData
* @param errMsg
*/
private void checkStationTrackDetail(CheckData checkData,List<String> errMsg){
if(Objects.equals(false,CollectionUtils.isEmpty(errMsg))){
return;
}
String departChar = checkData.departToChar();
Section masterSection = checkData.runPlan.getTrackSection();
TrackSection ts = checkData.stationTrackRepository.getDataMap().get(masterSection.getCode());
if(Objects.isNull(ts)){
String d = String.format("未找到对应的股道 方向[%s],车站[%s],车号[%s],股道[%s]",departChar,checkData.runPlanLog.getStation().getCode(),checkData.runPlanLog.getTripNumber(),masterSection.getCode());
log.error(d);
errMsg.add(d);
return;
}
checkStationTrackForTransfinite(ts,checkData.runPlanLog,errMsg,departChar);
checkStationTrackForTrainType(ts,checkData.runPlanLog,errMsg);
}
/**
* 行车计划股道超限检测
* @param ts
* @param runPlanLog
* @param errMsg
* @param departChar
*/
private void checkStationTrackForTransfinite(TrackSection ts,CtcStationRunPlanLog runPlanLog,List<String> errMsg,String departChar){
if(Objects.isNull(runPlanLog.getTransfinite())){
return;
}
CtcStationRunPlanLog.TransfiniteType sTT = ts.getTransfinite();
//大于一级超限
boolean transfiniteThanMoreOne =(runPlanLog.getTransfinite() == CtcStationRunPlanLog.TransfiniteType.TRANSFINITE_TWO_LEVEL ||
runPlanLog.getTransfinite() == CtcStationRunPlanLog.TransfiniteType.TRANSFINITE_SUPER);
//大于二级超限
boolean trainfiniteThanMoreTwo = runPlanLog.getTransfinite() == CtcStationRunPlanLog.TransfiniteType.TRANSFINITE_SUPER;
String logMsg = null;
String msg = null;
if(sTT == CtcStationRunPlanLog.TransfiniteType.NO && runPlanLog.getTransfinite() != CtcStationRunPlanLog.TransfiniteType.NO){
//股道不能超限，但是计划超限
logMsg = String.format("车站[%s],股道[%s],车次[%s],方向[%s],不支持超限，但行车计划超限[%s]",runPlanLog.getStation().getCode(),ts.getCode(),runPlanLog.getTripNumber(),departChar,runPlanLog.getTransfinite());
msg = String.format("车站[%s],股道[%s] 不支持超限",runPlanLog.getStation().getName(),ts.getName());
}else if(sTT == CtcStationRunPlanLog.TransfiniteType.TRANSFINITE_ONE_LEVEL && transfiniteThanMoreOne){
//股道是一级超限，但是计划是二级或是超级
logMsg = String.format("车站[%s],股道[%s],车次[%s],方向[%s],一级超限，但行车计划超限[%s]",runPlanLog.getStation().getCode(),ts.getCode(),runPlanLog.getTripNumber(),departChar,runPlanLog.getTransfinite());
msg = String.format("车站[%s],股道[%s] 只支持一级超限",runPlanLog.getStation().getName(),ts.getName());
}else if(sTT == CtcStationRunPlanLog.TransfiniteType.TRANSFINITE_TWO_LEVEL && trainfiniteThanMoreTwo){
//股道是二级超限，但是计划是超级
logMsg = String.format("车站[%s],股道[%s],车次[%s],方向[%s],二级超限，但行车计划超限[%s]",runPlanLog.getStation().getCode(),ts.getCode(),runPlanLog.getTripNumber(),departChar,runPlanLog.getTransfinite());
msg = String.format("车站[%s],股道[%s] 只支持二级超限",runPlanLog.getStation().getName(),ts.getName());
}
if(Objects.equals(false,Strings.isNullOrEmpty(logMsg))){
log.error(logMsg);
errMsg.add(msg);
}
}
/**
* 行车计划股道列车类型检测
* @param ts
* @param runPlanLog
* @param errMsg
*/
private void checkStationTrackForTrainType(TrackSection ts,CtcStationRunPlanLog runPlanLog,List<String> errMsg){
boolean trainTypeMatch = false;
TrackSection.TrainType tt = ts.getTrainType();
switch (tt){
case PASSENGER:
//检测客车，但是计划中不是客车
trainTypeMatch = Objects.equals(false,runPlanLog.isPassengerTrain());
break;
case GOODS_VAN:
//检测货车，但是计划中不是货车
trainTypeMatch = Objects.equals(true,runPlanLog.isPassengerTrain());
break;
default:
break;
}
if(trainTypeMatch){
String d = String.format("计划列车类型与股道类型不匹配，股道[%s] 股道区段[%s] 设置列车类型[%s],列车类型[%s]",ts.getCode(),ts.getSectionCode(),tt,runPlanLog.isPassengerTrain()?"客":"货");
log.error(d);
errMsg.add(String.format("计划列车类型与股道类型不匹配"));
}
}
/**
* 计划与出入口检测明细
* @param checkData
* @param errMsgList
*/
private void doorCheckDetail(CheckData checkData,List<String> errMsgList){
if(!CollectionUtils.isEmpty(errMsgList)){
return;
}
String depart = checkData.departToChar();
StationDirection sd = checkData.runPlan.getStationDirection();
StationDirection doorDir = checkData.doorRepository.getDataMap().get(sd.getCode());
if(Objects.isNull(doorDir)){
String d = String.format("根据计划方向[%s] 没有找到出入口数据 出入口[%s],车站[%s],车次[%s]"
,depart,sd.getCode(),checkData.runPlanLog.getStation().getCode(),checkData.runPlanLog.getTripNumber());
log.error(d);
errMsgList.add("未找到计划方向对应的出入口数据");
}
boolean isTransfinite = Objects.nonNull(checkData.runPlanLog.getTransfinite()) && checkData.runPlanLog.getTransfinite() != CtcStationRunPlanLog.TransfiniteType.NO;
if(!doorDir.isAllowOverrun() && isTransfinite){
// 出入口不能超限，但是计划超限
String d = String.format("出入口方向[%s],车站[%s]不允许超限,但是计划超限,车站[%s]，车次[%s]"
,sd.getCode(),depart,checkData.runPlanLog.getStation().getCode(),checkData.runPlanLog.getTripNumber());
log.error(d);
errMsgList.add(String.format("出入口[%s]不允许超限",doorDir.getName()));
return;
}
if(!doorDir.isTravelTrain() && Objects.equals(true,checkData.runPlanLog.isPassengerTrain())){
//出入口不支持客车，但是计划是客车
String d = String.format("出入口方向[%s],车站[%s]不允许客车,车站[%s]，车次[%s]"
,sd.getCode(),depart,checkData.runPlanLog.getStation().getCode(),checkData.runPlanLog.getTripNumber());
log.error(d);
errMsgList.add(String.format("出入口[%s]不支持接发客车",doorDir.getName()));
return;
}
if(!doorDir.isGoodsTrain() && Objects.equals(false,checkData.runPlanLog.isPassengerTrain())){
//出入口不支持货车，但是计划是货车
String d=String.format("出入口[%s],[%s]不允许货车,车站[%s]，车次[%s]"
,sd.getCode(),depart,checkData.runPlanLog.getStation().getCode(),checkData.runPlanLog.getTripNumber());
log.error(d);
errMsgList.add(String.format("出入口[%s]不支持接发货车",doorDir.getName()));
return;
}
}
@Data
@NoArgsConstructor
public static class CheckData{
private CtcStationRunPlanLog runPlanLog;
private CtcStationRunPlanLog.RunPlanItem runPlan;
private CtcEffectRepository.StationDoorRepository doorRepository;
private CtcEffectRepository.StationTrackSectionRepository stationTrackRepository;
private CtcEffectRepository.RegularTrainLineRepository regularTrainLineRepository;
private boolean justReturn;
private boolean isDepart;
public String departToChar(){
return isDepart ? "发":"接";
}
}
}

46
src/main/java/club/joylink/rtss/simulation/cbtc/CTC/service/runplan/CtcManageService.java
View File

@ -418,19 +418,53 @@ public class CtcManageService {
*/
public void stationUpdateFromEffect(Simulation simulation, String stationCode){
BusinessExceptionAssertEnum.DATA_ERROR.assertNotTrue(Objects.isNull(stationCode), String.format("车站号不能为空"));
CtcEffectRepository effectRepository = simulation.getCtcRepository().getCtcEffectRepository();
CtcEffectRepository.RegularTrainLineRepository regularTrainLineRepository = effectRepository.getRegularTrainLineMap().get(stationCode);
CtcEffectRepository repository = simulation.getCtcRepository().getCtcEffectRepository();
CtcEffectRepository.RegularTrainLineRepository regularTrainLineRepository = repository.getRegularTrainLineMap().get(stationCode);
boolean isEmptyData = Objects.isNull(regularTrainLineRepository) || regularTrainLineRepository.getDataMap().isEmpty();
BusinessExceptionAssertEnum.DATA_ERROR.assertNotTrue(isEmptyData, String.format("当前生效区没有数据，无法更新"));
// BusinessExceptionAssertEnum.DATA_ERROR.assertNotTrue(isEmptyData, String.format("当前生效区没有数据，无法更新"));
CtcEffectRepository.StationTrackSectionRepository sourceStationTrack = repository.getStationTrackSectionMap().get(stationCode);
CtcEffectRepository.StationDoorRepository sourceDoor = repository.getDoorRepository().get(stationCode);
if(Objects.nonNull(sourceStationTrack)){
CtcEffectRepository.StationTrackSectionRepository stationTrack = repository.getUpdateStationTrackSectionMap().get(stationCode);
if(Objects.isNull(stationTrack)){
stationTrack = new CtcEffectRepository.StationTrackSectionRepository();
repository.getUpdateStationTrackSectionMap().put(stationCode,stationTrack);
}
if(stationTrack.version() != sourceStationTrack.version()){
stationTrack.resetVersion(sourceStationTrack.version());
for (TrackSection value : sourceStationTrack.getDataMap().values()) {
stationTrack.save(value.clone());
}
}
}
if(Objects.nonNull(sourceDoor)){
CtcEffectRepository.StationDoorRepository door = repository.getUpdateDoorMap().get(stationCode);
if(Objects.isNull(door)){
door = new CtcEffectRepository.StationDoorRepository();
repository.getUpdateDoorMap().put(stationCode,door);
}
if(door.version() != sourceDoor.version()){
door.resetVersion(sourceDoor.version());
for (StationDirection d : sourceDoor.getDataMap().values()) {
door.save(d.clone());
}
}
}
if(Objects.equals(true,isEmptyData)){
return;
}
CtcEffectRepository.RegularTrainLineRepository updateRepository = simulation.getCtcRepository().getCtcEffectRepository().getUpdateReguarTrainLineMap().get(stationCode);
if(Objects.isNull(updateRepository)){
updateRepository = new CtcEffectRepository.RegularTrainLineRepository();
simulation.getCtcRepository().getCtcEffectRepository().getUpdateReguarTrainLineMap().put(stationCode,updateRepository);
}
if(updateRepository.version() != regularTrainLineRepository.version()){
updateRepository.resetVersion(regularTrainLineRepository.version());
for (RegularTrainLine val : regularTrainLineRepository.getDataMap().values()) {
updateRepository.save(val);
updateRepository.save(val.clone());
}
}else{
BusinessExceptionAssertEnum.DATA_ERROR.assertNotTrue(true, String.format("当前生效区与更新区的版本一致，无法更新"));
@ -446,8 +480,12 @@ public class CtcManageService {
public FZkVO<List<RegularTrainLineVO>> loadUpdateRegularTrainLineList(Simulation simulation, String stationCode){
BusinessExceptionAssertEnum.SYSTEM_EXCEPTION.assertNotTrue(Objects.isNull(stationCode), String.format("车站号不能为空"));
CtcEffectRepository repository = simulation.getCtcRepository().getCtcEffectRepository();
CtcEffectRepository.RegularTrainLineRepository tLRepository = repository.getUpdateReguarTrainLineMap().get(stationCode);
List<RegularTrainLineVO> list = this.loadRegularTrainLineData(tLRepository);
return FZkVO.of(CollectionUtils.isEmpty(list)?0:tLRepository.version(),list);
}

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

@ -3,6 +3,7 @@ package club.joylink.rtss.simulation.cbtc.build;
import club.joylink.rtss.entity.Ibp;
import club.joylink.rtss.simulation.cbtc.CI.data.StationDirection;
import club.joylink.rtss.simulation.cbtc.CTC.data.*;
import club.joylink.rtss.simulation.cbtc.Simulation;
import club.joylink.rtss.simulation.cbtc.data.CalculateService;
import club.joylink.rtss.simulation.cbtc.data.SimulationDataRepository;
@ -349,36 +350,83 @@ public class SimulationBuilder {
Map<String, CtcEffectRepository.StationTrackSectionRepository> stationTrackRepositoryMap = ctcRepository.getCtcManageRepository().getTrackSectionRepository();
Map<String, CtcEffectRepository.StationDoorRepository> doorRepository = ctcRepository.getCtcManageRepository().getDoorRepository();
Map<String, CtcEffectRepository.StationTrackSectionRepository> effectStationTrackMap = ctcRepository.getCtcEffectRepository().getStationTrackSectionMap();
Map<String, CtcEffectRepository.StationDoorRepository> effectDoorMap = ctcRepository.getCtcEffectRepository().getDoorRepository();
Map<String, CtcEffectRepository.StationTrackSectionRepository> updateStationTrackMap = ctcRepository.getCtcEffectRepository().getUpdateStationTrackSectionMap();
Map<String, CtcEffectRepository.StationDoorRepository> updateDoorMap = ctcRepository.getCtcEffectRepository().getUpdateDoorMap();
for (Station station : stationList) {
String stationCode = station.getCode();
CtcEffectRepository.StationTrackSectionRepository rep = stationTrackRepositoryMap.get(stationCode);
CtcEffectRepository.StationDoorRepository doorRep = doorRepository.get(stationCode);
if(rep == null){
rep = new CtcEffectRepository.StationTrackSectionRepository();
rep.incrementVersionOne();
stationTrackRepositoryMap.put(stationCode,rep);
}
if(doorRep == null){
doorRep = new CtcEffectRepository.StationDoorRepository();
doorRep.incrementVersionOne();
doorRepository.put(stationCode,doorRep);
}
for (StationDirection sd : station.getStationDirectionMap().values()) {
// StationIOGate ioGate = new StationIOGate();
// ioGate.setCode(sd.getCode());
// ioGate.setIoName(sd.getName());
// ioGate.setDirection(sd.getLabelEnum());
doorRep.save(sd.clone());
}
for (Stand stand : station.getAllStandList()) {
TrackSection ts = new TrackSection(stand.getSection());
rep.save(ts);
}
}
//复制编辑区的股道数据到生效，编辑区
copyEditToTargetForStationTrack(stationTrackRepositoryMap,effectStationTrackMap);
copyEditToTargetForStationTrack(stationTrackRepositoryMap,updateStationTrackMap);
//复制编辑区的出入口数据到生效，编辑区
copyEditToTargetForDoor(doorRepository,effectDoorMap);
copyEditToTargetForDoor(doorRepository,updateDoorMap);
}
private static void copyEditToTargetForStationTrack(Map<String, ? extends CtcEffectRepository.StationTrackSectionRepository> source, Map<String, CtcEffectRepository.StationTrackSectionRepository> target){
for (Map.Entry<String, ? extends CtcEffectRepository.StationTrackSectionRepository> entry : source.entrySet()) {
String stationCode = entry.getKey();
CtcEffectRepository.StationTrackSectionRepository val = entry.getValue();
CtcEffectRepository.StationTrackSectionRepository targetRepository = target.get(stationCode);
if(Objects.isNull(targetRepository)){
targetRepository = new CtcEffectRepository.StationTrackSectionRepository();
targetRepository.resetVersion(val.version());
target.put(stationCode,targetRepository);
}
for (Map.Entry<String, TrackSection> valEntry : val.getDataMap().entrySet()) {
String code = valEntry.getKey();
TrackSection vals = valEntry.getValue();
targetRepository.getDataMap().put(code,vals);
}
}
}
private static void copyEditToTargetForDoor(Map<String, ? extends CtcEffectRepository.StationDoorRepository> source, Map<String, CtcEffectRepository.StationDoorRepository> target){
for (Map.Entry<String, ? extends CtcEffectRepository.StationDoorRepository> entry : source.entrySet()) {
String stationCode = entry.getKey();
CtcEffectRepository.StationDoorRepository val = entry.getValue();
CtcEffectRepository.StationDoorRepository targetRepository = target.get(stationCode);
if(Objects.isNull(targetRepository)){
targetRepository = new CtcEffectRepository.StationDoorRepository();
targetRepository.resetVersion(val.version());
target.put(stationCode,targetRepository);
}
for (Map.Entry<String, StationDirection> valEntry : val.getDataMap().entrySet()) {
String code = valEntry.getKey();
StationDirection vals = valEntry.getValue();
targetRepository.getDataMap().put(code,vals);
}
}
}
public static List<String> checkRunPlanAndBuildLostRoutePaths(Map<String, List<TripPlan>> serverTripMap,
Map<String, List<RoutePath>> routePathMap) {
Map<String, String> errMsgMap = new HashMap<>();

5
src/main/java/club/joylink/rtss/simulation/cbtc/data/map/MayOutOfOrderDevice.java
View File

@ -41,6 +41,7 @@ public abstract class MayOutOfOrderDevice extends StatusDevice {
@JsonSubTypes.Type(value = Section.AxleFault.class, name = "Section$AxleFault$2"),
@JsonSubTypes.Type(value = Section.AxleFault.class, name = "Section$AxleFault$3"),
@JsonSubTypes.Type(value = Section.AxleFault.class, name = "Section$AxleFault$4"),
@JsonSubTypes.Type(value = Section.AxleFault.class, name = "Section$AxleFault$5"),
@JsonSubTypes.Type(value = Stand.Fault.class, name = "Stand$Fault$1"),
@JsonSubTypes.Type(value = Stand.Fault.class, name = "Stand$Fault$2"),
@JsonSubTypes.Type(value = Stand.Fault.class, name = "Stand$Fault$3"),
@ -57,7 +58,9 @@ public abstract class MayOutOfOrderDevice extends StatusDevice {
return false;
device.setFault(this);
return true;
};
}
;
default void fix(MayOutOfOrderDevice device) {
if (this.equals(device.fault))

5
src/main/java/club/joylink/rtss/simulation/cbtc/training2/Operation2.java
View File

@ -84,8 +84,11 @@ public abstract class Operation2 {
if (!result) { // 未失败
result = doSuccessVail();
}
if (result) {
// 这里开始时间为空是因为前端触发太快导致，线程还未走操作触发操作
if (result && this.startTime != null) {
this.remainTime = this.operatedTime.getNano() - this.startTime.getNano();
} else {
this.remainTime = 0;
}
return result;
}

6
src/main/java/club/joylink/rtss/simulation/cbtc/training2/Step2.java
View File

@ -156,7 +156,11 @@ public class Step2 {
*/
public void completionAndCalculate() {
// 整步骤完成耗费时间
this.remainTime = LocalDateTime.now().getNano() - this.startTime.getNano();
if (this.startTime != null) {
this.remainTime = LocalDateTime.now().getNano() - this.startTime.getNano();
} else {
this.remainTime = 0;
}
// 操作错误总数
this.count = this.operations.stream().mapToInt(o -> o.getCount().get()).sum();
}