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

列车运行控制——修改列车最高速度为350km/h

Browse Source 
新仿真逻辑——修改加载运行计划bug
This commit is contained in:
walker-sheng 2021-06-17 15:27:53 +08:00
parent b5c001eacf
commit 3639ea5a2f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/club/joylink/rtss/simulation/rt/RtSimulationService.java
View File

@ -68,7 +68,7 @@ public class RtSimulationService {
try { try {
rtSimulation.mapVO = mapVO; rtSimulation.mapVO = mapVO;
this.loadingMap(rtSimulation, mapVO); this.loadingMap(rtSimulation, mapVO);
this.loadRunPlan(rtSimulation, this.queryUserRunPlan(accountVO.getId(), mapId)); this.loadRunPlan(rtSimulation, this.queryUserRunPlan(mapId, accountVO.getId()));
this.initSimulationMember(rtSimulation); this.initSimulationMember(rtSimulation);
this.initCreatorPlayMember(rtSimulation, mapVO); this.initCreatorPlayMember(rtSimulation, mapVO);
} catch (Exception e) { } catch (Exception e) {

4
src/main/java/club/joylink/rtss/simulation/rt/TL/bo/TlTrain.java
View File

@ -185,7 +185,7 @@ public class TlTrain extends TlDevice {
// G7(7, 95, 250, 0.41f, 0.29f), // G7(7, 95, 250, 0.41f, 0.29f),
// G8(8, 120, 300, 0.35f, 0.21f), // G8(8, 120, 300, 0.35f, 0.21f),
// G9(9, 150, 360, 0.26f, 0.16f), // G9(9, 150, 360, 0.26f, 0.16f),
G(1, 3, 100, 1.69f, 0.18f) G(1, 3, 350, 1.69f, 0.18f)
; ;
int gear; int gear;
@ -244,7 +244,7 @@ public class TlTrain extends TlDevice {
} }
} }
// 摩擦阻力 // 摩擦阻力
fb += 0.034 * this.srTrain.getTotalMass(); fb += 0.034 * this.srTrain.getTotalMass() + speed*speed;
// 根据制动阀计算制动力 // 根据制动阀计算制动力
fb += this.calculateFb(); fb += this.calculateFb();
// 计算合力 // 计算合力