|
|
421d5c36c0
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-12-23 17:48:16 +08:00 |
|
|
|
2c4e631b64
|
生成实训后检查考试规则是否符合要求；增加更改考试规则的接口
|
2021-12-23 17:45:06 +08:00 |
|
|
|
06cdf717b1
|
列车运行bug修改
|
2021-12-15 18:17:00 +08:00 |
|
|
|
31bf05101c
|
修改区段道岔失表时道岔区段占用显示异常的问题；修改区段故障的应用和修复逻辑的表述
|
2021-12-15 14:39:30 +08:00 |
|
|
|
d0a380156e
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-12-15 11:30:36 +08:00 |
|
|
|
9da6d14211
|
加载列车时，如果在站间，增加设置列车的到达、离站信息
|
2021-12-15 11:30:17 +08:00 |
|
Jade
|
bb851f3309
|
转换轨发车时间
|
2021-12-15 09:30:47 +08:00 |
|
|
|
d16909dd2c
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-12-14 17:47:14 +08:00 |
|
Jade
|
7047768aa9
|
屏蔽门故障只对非CTC进路有效
|
2021-12-14 17:42:08 +08:00 |
|
|
|
4d14cd19fd
|
【站台折返策略不生效】逻辑补全
|
2021-12-14 17:33:55 +08:00 |
|
Jade
|
8c7b9f6f89
|
isUpdateTripPlanByServiceNumber
|
2021-12-14 16:23:09 +08:00 |
|
|
|
4442223dfc
|
修改站台折返策略处理逻辑
|
2021-12-14 16:11:56 +08:00 |
|
|
|
82253f1832
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-12-14 15:02:52 +08:00 |
|
|
|
f27b86b502
|
添加线路配置
|
2021-12-14 15:02:36 +08:00 |
|
Jade
|
17cade484f
|
Merge remote-tracking branch 'origin/test' into test
|
2021-12-13 17:31:51 +08:00 |
|
Jade
|
11d9c2c421
|
车辆段逻辑
|
2021-12-13 17:31:44 +08:00 |
|
|
|
61fdd4941d
|
统一列车target更新逻辑
|
2021-12-13 17:29:14 +08:00 |
|
|
|
be92513d93
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-12-13 11:22:11 +08:00 |
|
|
|
b8687f8d40
|
修改机器人驾驶识别信号机bug
|
2021-12-13 11:21:59 +08:00 |
|
Jade
|
6b7a36aeed
|
车辆段逻辑
|
2021-12-13 11:02:48 +08:00 |
|
|
|
690acdba5f
|
列车状态信息增加预选模式
|
2021-12-13 10:38:05 +08:00 |
|
|
|
46acce3f6b
|
处理福州线列车在二十一站左侧折返轨停车会导致提前更换车次问题；机器人驾驶增加识别信号机功能；处理车辆段的列车以备用车方式加载到正线上时因ctc移动授权丢失引起的问题；
|
2021-12-10 11:20:05 +08:00 |
|
|
|
306e91296a
|
运行图检查修改：当前后两车次分别是入库、出库时，无需前者的尾与后者的首相同
|
2021-12-10 10:03:51 +08:00 |
|
|
|
7dab924ae2
|
增加苏安院项目
|
2021-12-09 17:01:00 +08:00 |
|
|
|
f681f3a20f
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-12-09 16:33:36 +08:00 |
|
|
|
f8b2636355
|
延续保护区段允许选择逻辑区段
|
2021-12-09 16:33:19 +08:00 |
|
Jade
|
52821e1200
|
回库逻辑，加载备用车
|
2021-12-09 15:25:05 +08:00 |
|
xiazengbin
|
c6aa328d1d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server.git into test2-xzb-1
|
2021-12-09 14:39:29 +08:00 |
|
xiazengbin
|
3ebab8ed31
|
优化车辆段路径搜索
|
2021-12-09 14:29:24 +08:00 |
|
|
|
fd40f9de78
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-12-09 13:25:44 +08:00 |
|
|
|
3577f7331b
|
增加【列车到达速度上限后牵引力与阻力持平】逻辑
|
2021-12-09 13:18:34 +08:00 |
|
Jade
|
0a52d4d029
|
显示配置-车次窗车头翻转
|
2021-12-09 10:28:13 +08:00 |
|
Jade
|
7f2b12dd9f
|
Merge remote-tracking branch 'origin/test2' into test
|
2021-12-09 09:13:11 +08:00 |
|
Jade
|
42e0d734f7
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# src/main/java/club/joylink/rtss/simulation/cbtc/data/map/MapConfig.java
|
2021-12-09 09:12:47 +08:00 |
|
Jade
|
ce26b80e6a
|
车辆段 逻辑完善
|
2021-12-08 17:55:07 +08:00 |
|
|
|
edd6279e63
|
Merge branch 'test' into dev
|
2021-12-08 17:06:34 +08:00 |
|
|
|
e6f6421e50
|
Merge branch 'test' into test2
|
2021-12-08 17:06:08 +08:00 |
|
|
|
d60703a4cf
|
Merge branch 'dev' into test2
# Conflicts:
# src/main/java/club/joylink/rtss/simulation/cbtc/data/map/MapConfig.java
|
2021-12-08 17:05:45 +08:00 |
|
|
|
d557113276
|
修改【使用增加计划功能增加计划时，可能出现既是入库计划又是折返计划情况】的bug
|
2021-12-08 17:05:03 +08:00 |
|
Jade
|
c5eba208ff
|
Merge remote-tracking branch 'origin/test2' into test2
|
2021-12-08 15:46:29 +08:00 |
|
Jade
|
1bf100f117
|
车辆段 出库逻辑
|
2021-12-08 15:46:03 +08:00 |
|
|
|
d9454dced0
|
Merge remote-tracking branch 'origin/test2' into test2
|
2021-12-08 15:41:23 +08:00 |
|
|
|
6372892cdb
|
修改重设车次号逻辑的位置以覆盖生成单条计划的情况
|
2021-12-08 15:41:11 +08:00 |
|
|
|
15f9f69428
|
增加线路配置【运行图中车次号唯一】（影响生成计划的车次号）与相应逻辑
|
2021-12-08 15:40:43 +08:00 |
|
|
|
13a11337dd
|
修改重设车次号逻辑的位置以覆盖生成单条计划的情况
|
2021-12-08 15:31:13 +08:00 |
|
|
|
2ee752a73c
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-12-08 15:01:40 +08:00 |
|
|
|
7fcf48be35
|
增加线路配置【运行图中车次号唯一】（影响生成计划的车次号）与相应逻辑
|
2021-12-08 15:01:17 +08:00 |
|
Jade
|
88e5fa6abb
|
车辆段 派班计划生成调整
|
2021-12-08 13:05:44 +08:00 |
|
|
|
bed44dc77f
|
Merge remote-tracking branch 'origin/test2' into test2
|
2021-12-08 11:01:14 +08:00 |
|
|
|
58cf6af8c7
|
修改ATS逻辑：【计划车到转换轨准备回库时自动转人工车】【有车辆段时回库列车不消失】
|
2021-12-08 11:01:06 +08:00 |
|
