Commit Graph

428 Commits

Author SHA1 Message Date
c7460ae397 添加跳停+停站时间策略对象 2021-02-03 10:48:33 +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
DU
2fdda0a4d1 自动进路和折返 按钮实训生成 2021-01-28 17:57:38 +08:00
3316c11fed 调整ZC非通信车占用逻辑忽略道岔区段 2021-01-28 17:47:08 +08:00
d669bb2d4c 进路路径查询方法哈尔滨ATP进路逻辑调整 2021-01-28 17:43:52 +08:00
05ab248b18 进路路径对象调整
进路路径查询方法重写
按计划行车加载列车逻辑调整
进路延续保护侧防逻辑问题修改
2021-01-28 16:36:07 +08:00
6531a09c60 Merge remote-tracking branch 'origin/test' into test 2021-01-28 09:10:01 +08:00
a1e2e9dc8c 客流策略计算结构调整 2021-01-28 09:09:46 +08:00
447b0e861a 运行图发布后删除旧的派班计划 2021-01-27 19:18:18 +08:00
ec71cf4c20 Merge remote-tracking branch 'origin/test' into test 2021-01-27 19:05:33 +08:00
467cae3d01 运行图发布后删除缓存 2021-01-27 19:05:20 +08:00
DU
62edf56871 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-01-27 18:17:43 +08:00
DU
e1ef8cf549 运行图编制修改,加载列车位置修改,ato bug修改 2021-01-27 18:17:34 +08:00
f6814f8e04 客流模拟仿真逻辑调整
修改停站时间策略逻辑bug
添加跳停策略和计算服务对象,未实现
2021-01-27 15:33:59 +08:00
2ddedd3134 Merge remote-tracking branch 'origin/test' into test 2021-01-26 18:41:56 +08:00
bf326074ad 修改取消进路时延时解锁条件 2021-01-26 18:41:51 +08:00
927b5bb83c Merge remote-tracking branch 'origin/test' into test 2021-01-26 18:39:22 +08:00
51285bf767 客流策略流程和停站时间策略逻辑开发 2021-01-26 18:39:05 +08:00
DU
bf3bf28fad Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-01-26 16:21:45 +08:00
DU
44a7972427 实训生成修改 2021-01-26 16:21:32 +08:00