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

泰国沙盘停站延时改动

Browse Source
This commit is contained in:
joylink_zhangsai 2023-06-04 18:28:16 +08:00
parent 74b9ab80da
commit 7d678f3d61
2 changed files with 64 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/java/club/joylink/rtss/services/project/DeviceServiceImpl.java
View File

@ -1003,13 +1003,40 @@ public class DeviceServiceImpl implements DeviceService {
headDelayTime = 5.5f; headDelayTime = 5.5f;
break; break;
case "T175": //4站-IIG case "T175": //4站-IIG
headDelayTime = 6.5f;
break;
case "T174": //4站-4G
headDelayTime = 6.2f;
break;
case "T176": //4站-6G
headDelayTime = 6f;
break;
case "T179": //4站-5G
headDelayTime = 5.9f;
break;
case "T121": //3站-IIG
headDelayTime = 5.1f;
break;
case "T120": //3站-4G
headDelayTime = 5.5f; headDelayTime = 5.5f;
break; break;
case "T121": //4站-IIG case "T77": //2站-IIG
headDelayTime = 5.2f; headDelayTime = 6.1f;
break; break;
case "T77": //4站-IIG case "T76": //2站-4G
headDelayTime = 6f; headDelayTime = 5.7f;
break;
case "T22": //1站-1G
headDelayTime = 5.1f;
break;
case "T23": //1站-IIG
headDelayTime = 5.1f;
break;
case "T24": //1站-4G
headDelayTime = 5.1f;
break;
case "T25": //1站-6G
headDelayTime = 5.1f;
break; break;
case "T145": //QX04 case "T145": //QX04
tailDelayTime = 0f; tailDelayTime = 0f;

40
src/main/java/club/joylink/rtss/simulation/cbtc/device/real/udp/thailand/service/ThailandTrainServiceImpl.java
View File

@ -19,7 +19,6 @@ import club.joylink.rtss.simulation.cbtc.device.real.udp.thailand.config.Thailan
import club.joylink.rtss.simulation.cbtc.device.real.udp.thailand.config.ThailandTrainConfig; import club.joylink.rtss.simulation.cbtc.device.real.udp.thailand.config.ThailandTrainConfig;
import club.joylink.rtss.simulation.cbtc.onboard.ATP.ATPService; import club.joylink.rtss.simulation.cbtc.onboard.ATP.ATPService;
import club.joylink.rtss.vo.client.project.thailand.ThailandSectionConfigVO; import club.joylink.rtss.vo.client.project.thailand.ThailandSectionConfigVO;
import club.joylink.rtss.vo.map.graph.MapSectionNewVO;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Objects; import java.util.Objects;
@ -108,7 +107,7 @@ public class ThailandTrainServiceImpl implements UDPRealDeviceService {
} }
} }
//根据区段的配置信息，设置车头位置更新至停车点的时间 //根据区段的配置信息，设置车头位置更新至停车点的时间
// fill(headSection, sectionConfig.getConfigVO()); 仅用于调试 // fill(headSection, sectionConfig.getConfigVO());
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
if (config.getTimeOfArriveStopPoint() == null) { if (config.getTimeOfArriveStopPoint() == null) {
int rate = 1000000000; //秒到纳秒的换算比例 int rate = 1000000000; //秒到纳秒的换算比例
@ -226,7 +225,7 @@ public class ThailandTrainServiceImpl implements UDPRealDeviceService {
} }
/** /**
* 此方法用于调试，调试完成后方法内的数据请保存到项目设备配置{@link club.joylink.rtss.services.project.DeviceServiceImpl#thailandFillTime(ThailandSectionConfigVO, MapSectionNewVO)} * 此方法用于调试，调试完成后方法内的数据请保存到项目设备配置
*/ */
public void fill(Section section, ThailandSectionConfigVO configVO) { public void fill(Section section, ThailandSectionConfigVO configVO) {
Float headDelayTime = null; Float headDelayTime = null;
@ -245,13 +244,40 @@ public class ThailandTrainServiceImpl implements UDPRealDeviceService {
headDelayTime = 5.5f; headDelayTime = 5.5f;
break; break;
case "T175": //4站-IIG case "T175": //4站-IIG
headDelayTime = 6.5f;
break;
case "T174": //4站-4G
headDelayTime = 6.2f;
break;
case "T176": //4站-6G
headDelayTime = 6f;
break;
case "T179": //4站-5G
headDelayTime = 5.9f;
break;
case "T121": //3站-IIG
headDelayTime = 5.1f;
break;
case "T120": //3站-4G
headDelayTime = 5.5f; headDelayTime = 5.5f;
break; break;
case "T121": //4站-IIG case "T77": //2站-IIG
headDelayTime = 5.2f; headDelayTime = 6.1f;
break; break;
case "T77": //4站-IIG case "T76": //2站-4G
headDelayTime = 6f; headDelayTime = 5.7f;
break;
case "T22": //1站-1G
headDelayTime = 5.1f;
break;
case "T23": //1站-IIG
headDelayTime = 5.1f;
break;
case "T24": //1站-4G
headDelayTime = 5.1f;
break;
case "T25": //1站-6G
headDelayTime = 5.1f;
break; break;
case "T145": //QX04 case "T145": //QX04
tailDelayTime = 0f; tailDelayTime = 0f;