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 |
|
Jade
|
2cad9aea15
|
车辆段fix
|
2021-12-08 10:57:35 +08:00 |
|
Jade
|
549e1ef058
|
车辆段排列进路逻辑
|
2021-12-08 10:36:11 +08:00 |
|
Jade
|
4755d9a137
|
车辆段逻辑优化
|
2021-12-07 17:53:53 +08:00 |
|
Jade
|
087a603bc0
|
Merge remote-tracking branch 'origin/test2' into test2
|
2021-12-07 15:50:24 +08:00 |
|
Jade
|
645bfee559
|
车辆段逻辑
|
2021-12-07 15:50:10 +08:00 |
|
|
|
bc2451cc18
|
Merge remote-tracking branch 'origin/test2' into test2
|
2021-12-07 15:47:53 +08:00 |
|
|
|
2e09968362
|
修改ZC默认关联的区段筛选bug
|
2021-12-07 15:47:41 +08:00 |
|
xiazengbin
|
cae20aba53
|
车辆段加载route path 添加过滤
|
2021-12-07 15:26:50 +08:00 |
|
Jade
|
2433e7d813
|
车辆段逻辑
|
2021-12-07 11:27:48 +08:00 |
|
Jade
|
bac67b2ebf
|
Merge remote-tracking branch 'origin/test2' into test2
|
2021-12-07 09:46:03 +08:00 |
|
xiazengbin
|
09b0f92614
|
优化loadDepotInOutRoutePath
|
2021-12-07 09:43:15 +08:00 |
|
xiazengbin
|
578d1fd44a
|
优化loadDepotInOutRoutePath
|
2021-12-07 09:38:44 +08:00 |
|
Jade
|
a834811cab
|
Merge remote-tracking branch 'origin/test2' into test2
|
2021-12-07 09:24:25 +08:00 |
|
xiazengbin
|
b9a550a6a5
|
优化loadDepotInOutRoutePath
|
2021-12-07 09:12:32 +08:00 |
|
|
|
b9dbb891ce
|
Merge remote-tracking branch 'origin/test' into test
|
2021-12-06 21:17:19 +08:00 |
|
xiazengbin
|
76876c6818
|
Merge remote-tracking branch 'origin/test2' into test2-xzb
|
2021-12-06 18:18:45 +08:00 |
|
xiazengbin
|
eb56128954
|
SimulationBuilder.build中实现加载车辆段route path
|
2021-12-06 18:06:01 +08:00 |
|
Jade
|
7254a02356
|
车辆段逻辑
|
2021-12-06 16:15:12 +08:00 |
|
|
|
dbc3a62b7f
|
Merge branch 'dev' into test2
|
2021-12-06 16:00:15 +08:00 |
|
|
|
ac1e32082c
|
【线路的ZC只有一个】且【ZC没有设置关联区段】时，自动关联全线计轴区段（以前是物理区段）；修改【区段有ZC在工作】的判定为【所属计轴区段有ZC在工作】
|
2021-12-06 15:52:14 +08:00 |
|
|
|
f5c711da90
|
修改岔心所在计轴区段预复位成功后，预复位状态未清除的bug
|
2021-12-06 13:22:48 +08:00 |
|
|
|
2258062e9a
|
列车经过【ARB】【进路锁闭】的区段之后，取消进路锁闭
|
2021-12-06 10:31:53 +08:00 |
|
Jade
|
05e0eedb34
|
列车加载到车辆段
|
2021-12-03 17:58:56 +08:00 |
|
|
|
d27df770d6
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-12-02 13:00:20 +08:00 |
|
|
|
09d423a3f4
|
重启令解实训，背景给车站设置站控；列车经过【ARB】【进路锁闭】的区段之后，取消进路锁闭
|
2021-12-02 12:59:54 +08:00 |
|
Jade
|
be7e4f7a83
|
门选零位不给牵引力
|
2021-12-02 10:25:07 +08:00 |
|
|
|
a7acb9929d
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-12-01 18:29:49 +08:00 |
|
