|
|
5695af9fac
|
客流消息添加单独订阅路径
客流订阅事件处理
客流计算逻辑调整-跳停考虑跳站规则
策略消息推送对象修改
|
2021-02-04 18:02:11 +08:00 |
|
|
|
64e71ed9ea
|
线段加俩参数
|
2021-02-04 17:55:50 +08:00 |
|
|
|
0e8e394d04
|
Merge remote-tracking branch 'origin/test' into test
|
2021-02-04 17:39:59 +08:00 |
|
|
|
e0b6209e91
|
封锁信号机时去掉重复封锁逻辑
|
2021-02-04 17:39:51 +08:00 |
|
DU
|
74dd554a9e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-02-04 17:27:05 +08:00 |
|
DU
|
1635c356ed
|
实训补充修改
|
2021-02-04 17:26:53 +08:00 |
|
|
|
06e3ab8b6e
|
移动授权终点添加<未锁闭或延时解锁的区段>；延时解锁进路的始端信号机重开时取消延时解锁；取消进路后，始端信号机锁闭进路字段置为null
|
2021-02-04 17:18:15 +08:00 |
|
|
|
40791540e2
|
添加<ATS自动调整运行>配置
|
2021-02-04 11:10:56 +08:00 |
|
|
|
cc9aba942c
|
Merge remote-tracking branch 'origin/test' into test
|
2021-02-03 18:35:32 +08:00 |
|
|
|
ee2922f84a
|
泰雷兹操作（未测试）；边缘车站可以跳停；进路延时解锁时无法取消进路；根据运行时间计算ATO速度逻辑修改
|
2021-02-03 18:34:40 +08:00 |
|
|
|
54c5ec595c
|
空指针异常屏蔽
|
2021-02-03 18:24:30 +08:00 |
|
|
|
f843b9ace0
|
修改停站时间计算和站间运行时间计算逻辑
修改ATS进路排列触发——折返计划与出库计划冲突bug
|
2021-02-03 16:28:53 +08:00 |
|
|
|
e9d03da5e0
|
Merge remote-tracking branch 'origin/test' into test
|
2021-02-03 14:49:42 +08:00 |
|
|
|
546f558397
|
添加仿真延时任务对象和逻辑
|
2021-02-03 14:48:48 +08:00 |
|
DU
|
4aed94d481
|
实训计轴预复位修改
|
2021-02-03 11:33:13 +08:00 |
|
|
|
cb695a9be5
|
Merge remote-tracking branch 'origin/test' into test
|
2021-02-03 10:48:53 +08:00 |
|
|
|
c7460ae397
|
添加跳停+停站时间策略对象
|
2021-02-03 10:48:33 +08:00 |
|
DU
|
418c9dff1f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-02-03 10:12:42 +08:00 |
|
DU
|
fcce73733a
|
连锁控实训
|
2021-02-03 10:12:32 +08:00 |
|
|
|
616ce791fd
|
Merge remote-tracking branch 'origin/test' into test
|
2021-02-03 09:41:37 +08:00 |
|
|
|
35426622ff
|
客流策略消息推送添加到topic
|
2021-02-03 09:41:20 +08:00 |
|
DU
|
acec4fcddc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-02-02 18:40:46 +08:00 |
|
DU
|
d2e3a42304
|
实训修改
|
2021-02-02 18:40:37 +08:00 |
|
|
|
b5c3d1867e
|
Merge remote-tracking branch 'origin/test' into test
|
2021-02-02 18:35:59 +08:00 |
|
|
|
99ddf2db15
|
客流策略——跳停策略逻辑开发
|
2021-02-02 18:35:41 +08:00 |
|
DU
|
f504f457ed
|
操作参数化
|
2021-02-02 11:31:58 +08:00 |
|
DU
|
12b6bca36a
|
车站实训修改
|
2021-02-02 10:29:53 +08:00 |
|
DU
|
cfac9c6d9f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-02-02 09:28:28 +08:00 |
|
DU
|
a39bc85eaf
|
实训修改
|
2021-02-02 09:28:16 +08:00 |
|
|
|
44965d8054
|
修改进路办理超时失败时间为20秒
|
2021-02-01 13:57:32 +08:00 |
|
|
|
202e0bb01f
|
进路逻辑bug修改
|
2021-02-01 13:53:35 +08:00 |
|
|
|
dd434fe399
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-29 18:07:14 +08:00 |
|
|
|
7419a859cf
|
修改国赛权限价格
|
2021-01-29 18:06:24 +08:00 |
|
|
|
e9976772de
|
客流策略调整
|
2021-01-29 18:04:30 +08:00 |
|
|
|
d3d8bd7f0d
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-29 17:49:16 +08:00 |
|
|
|
cf5e1238d7
|
添加国赛购买流程
|
2021-01-29 17:49:11 +08:00 |
|
|
|
637908fd94
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-29 16:44:51 +08:00 |
|
|
|
298fb9a1a3
|
转换轨列车添加停站流程
修改由转换轨列车流程导致的ATS进路触发逻辑问题
修改进路延续保护道岔锁闭逻辑bug
修改转换轨列车初始化加载逻辑
|
2021-01-29 16:44:35 +08:00 |
|
DU
|
3c69dcaf30
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-01-29 14:21:31 +08:00 |
|
DU
|
2d811766ff
|
实训修改
|
2021-01-29 14:21:22 +08:00 |
|
|
|
dd4a72b130
|
联锁生成添加信号机接近区段不跨过前方同向信号机配置和逻辑
|
2021-01-29 11:23:07 +08:00 |
|
|
|
a268d69305
|
修改区段非通信车占用判断逻辑
|
2021-01-29 10:20:37 +08:00 |
|
|
|
fb343bba80
|
修改侧防锁闭条件
|
2021-01-29 09:53:04 +08:00 |
|
|
|
1f3d9a6f3a
|
按计划行车列车加载位置bug修改
|
2021-01-29 09:19:21 +08:00 |
|
|
|
917705eea8
|
ZC非通信车占用移动授权逻辑bug修改
|
2021-01-28 19:08:40 +08:00 |
|
DU
|
a89d0735f7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-01-28 18:16:19 +08:00 |
|
DU
|
a6cae4e14c
|
实训修改
|
2021-01-28 18:16:11 +08:00 |
|
|
|
aca0b3ebc6
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-28 18:10:16 +08:00 |
|
|
|
bffa883703
|
加载列车——构建列车监控信息，站间情况判断调整为列车位置是否在进路路径中
|
2021-01-28 18:09:50 +08:00 |
|
DU
|
32972e5697
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-01-28 17:57:48 +08:00 |
|
