DU
|
68041fa54b
|
实训修改
|
2021-02-05 15:14:56 +08:00 |
|
|
|
eb6d51c22b
|
Merge remote-tracking branch 'origin/test' into test
|
2021-02-05 13:37:28 +08:00 |
|
|
|
e37fa24c31
|
修改<未锁闭的区段>移动授权终点判定条件
|
2021-02-05 13:37:18 +08:00 |
|
|
|
55449d3a67
|
修改站间运行时间计算预计离开时间有时空指针的bug
|
2021-02-05 09:51:48 +08:00 |
|
|
|
d9f9ce640e
|
Merge remote-tracking branch 'origin/test' into test
|
2021-02-05 09:50:25 +08:00 |
|
|
|
a87ca75d37
|
修改站间运行时间计算预计离开时间有时空指针的bug
|
2021-02-05 09:50:13 +08:00 |
|
DU
|
38fd5a14a2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-02-04 18:33:55 +08:00 |
|
DU
|
6f17bc3089
|
drawWay字段删除，数据库同步删除
|
2021-02-04 18:33:46 +08:00 |
|
|
|
33ade9bc31
|
修改<未锁闭的区段>移动授权终点判定条件
|
2021-02-04 18:25:22 +08:00 |
|
|
|
5f8c2039c5
|
Merge remote-tracking branch 'origin/test' into test
|
2021-02-04 18:14:22 +08:00 |
|
|
|
51e88d488d
|
修改<未锁闭的区段>移动授权终点判定条件
|
2021-02-04 18:14:08 +08:00 |
|
|
|
3f35c48cb3
|
Merge remote-tracking branch 'origin/test' into test
|
2021-02-04 18:02:28 +08:00 |
|
|
|
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 |
|
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 |
|
|
|
4322ed671e
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-26 14:32:29 +08:00 |
|
|
|
e92867a2bc
|
添加项目枚举
|
2021-01-26 14:32:08 +08:00 |
|
|
|
b678d3e103
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-26 13:18:17 +08:00 |
|
|
|
17abe86959
|
列车初始化bug修改；取消进路延时解锁条件修改；设头码车时查询路径逻辑修改
|
2021-01-26 13:18:10 +08:00 |
|
DU
|
d491b56ef3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-01-26 10:01:19 +08:00 |
|
DU
|
bd75dd9b3e
|
站间距计算修改
|
2021-01-26 10:01:08 +08:00 |
|
|
|
bb8a694132
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-26 09:12:20 +08:00 |
|
|
|
0aae6b66fc
|
Merge remote-tracking branch 'origin/passenger' into test
|
2021-01-26 09:01:51 +08:00 |
|
|
|
8911cfa6b1
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-25 19:44:37 +08:00 |
|
|
|
7d30ceb7de
|
列车添加倒车最大速度，列车运行逻辑对应修改
|
2021-01-25 19:44:32 +08:00 |
|
DU
|
d8897d80d7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-01-25 19:26:42 +08:00 |
|
DU
|
8deceb2a2c
|
站间距根据精确到停车点；
折返按钮状态保存
|
2021-01-25 19:26:31 +08:00 |
|
|
|
c159f9a8c1
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-25 19:13:35 +08:00 |
|
|
|
f4c16da685
|
碰撞检测bug修改
|
2021-01-25 19:13:23 +08:00 |
|
|
|
1f88489d3b
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-25 19:05:43 +08:00 |
|
|
|
1527a8ccf1
|
信号重复封锁逻辑修改
|
2021-01-25 19:05:30 +08:00 |
|
|
|
02d4d12933
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-25 18:45:46 +08:00 |
|
|
|
8459f38fc3
|
添加列车<倒车限速><碰撞检测逻辑>
|
2021-01-25 18:45:36 +08:00 |
|
|
|
5a53001eaf
|
信号重复封锁逻辑修改
|
2021-01-25 18:31:28 +08:00 |
|
DU
|
15462ece3a
|
站间距离修改
|
2021-01-25 17:48:06 +08:00 |
|
|
|
ebb8cfd55e
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-25 17:45:46 +08:00 |
|
DU
|
c26fb273e8
|
折返站的设置折返实训
|
2021-01-25 17:16:01 +08:00 |
|
DU
|
96acf9671b
|
运行等级的站间距离根据地图重新更新
|
2021-01-25 17:11:02 +08:00 |
|
DU
|
f3eb9096c4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-01-25 16:17:48 +08:00 |
|
|
|
4da39b13f2
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-25 16:14:23 +08:00 |
|
|
|
f05398e33c
|
信号重复封锁的检查区段改为第一个逻辑区段；<延续保护未锁闭>的移动授权改为<延续保护前100m|延续保护前一个区段距离更远的那个端点>
|
2021-01-25 16:13:57 +08:00 |
|
|
|
e5fe7c4dd3
|
联锁生成——延续保护和侧防生成道岔相关逻辑调整
仿真初始化进路状态添加侧防元素转换锁闭逻辑
进路服务修改侧防锁闭，道岔预先锁闭等逻辑
|
2021-01-25 16:13:21 +08:00 |
|
DU
|
e33afe5a10
|
更新站间运行等级也可修改距离
|
2021-01-25 15:44:10 +08:00 |
|
DU
|
a4e4dd92cf
|
西安二号线 车站设置折返线 实训
|
2021-01-25 15:19:54 +08:00 |
|
DU
|
36b509ff40
|
更新站间数据
|
2021-01-25 14:47:57 +08:00 |
|
|
|
5e2c83d565
|
信号重开逻辑修改
|
2021-01-25 14:47:46 +08:00 |
|
DU
|
04eb086254
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-01-25 14:12:00 +08:00 |
|
DU
|
3d99582eb1
|
组织用户关系更改
|
2021-01-25 14:11:45 +08:00 |
|
DU
|
7120e303be
|
成都三现地信号机自动控和人工控实训名字
|
2021-01-25 14:00:47 +08:00 |
|
|
|
4a4c5fa92f
|
修改车站字段类型
|
2021-01-25 13:29:32 +08:00 |
|
|
|
642fc17de5
|
列车移动授权计算对<屏蔽门开启>情况的处理逻辑修改；道岔、车站添加字段
|
2021-01-25 13:13:42 +08:00 |
|
|
|
2a8e87ce14
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-25 11:24:39 +08:00 |
|
|
|
68e57fa9b0
|
添加进路延续保护侧防锁闭和解锁逻辑
|
2021-01-25 11:24:20 +08:00 |
|
|
|
e351662dcc
|
添加挤岔恢复指令
|
2021-01-22 21:12:01 +08:00 |
|
|
|
efeda41423
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-22 20:48:27 +08:00 |
|
|
|
face2acfac
|
进路信号封锁联锁检查和开放逻辑修改
|
2021-01-22 20:48:14 +08:00 |
|
|
|
39af42d875
|
添加道岔计轴预复位的状态及处理逻辑
|
2021-01-22 20:38:36 +08:00 |
|
|
|
6e6e0a9ca7
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-22 18:58:29 +08:00 |
|
|
|
8a4e459b3e
|
客流停站时间策略逻辑开发
|
2021-01-22 18:58:14 +08:00 |
|
|
|
4e85d158e4
|
岔心强解bug修改
|
2021-01-22 18:26:26 +08:00 |
|
|
|
808d7c3ee9
|
修改道岔计轴区段的非通信车占用逻辑（ARB那里）
|
2021-01-22 18:15:10 +08:00 |
|
|
|
70b01e3f5f
|
修改开放引导信号时的判断信号机接近区段占用逻辑
|
2021-01-22 17:29:50 +08:00 |
|
|
|
8cc9e9f3d2
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-22 16:29:46 +08:00 |
|
|
|
dc6fc9345c
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-22 16:28:07 +08:00 |
|
|
|
8c9392bf14
|
修改ATS进路触发逻辑
修改进路排列如果进路已经锁闭直接返回
修改道岔单操逻辑bug
|
2021-01-22 16:27:46 +08:00 |
|
|
|
411d276baa
|
实现<区段预复位>操作
|
2021-01-22 15:10:21 +08:00 |
|
|
|
5eb20f669c
|
取消进路同时取消追踪模式；岔心关联区段锁闭时，岔心区段也锁闭
|
2021-01-21 19:30:18 +08:00 |
|
|
|
88331d6b72
|
道岔添加<挤岔>故障及逻辑；修改区故解和道岔区故解逻辑
|
2021-01-21 17:11:15 +08:00 |
|
|
|
f67542a5c2
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-21 16:16:45 +08:00 |
|
|
|
c747a67d59
|
ATS进路触发bug修改，添加进路服务日志
|
2021-01-21 16:09:38 +08:00 |
|
|
|
ff2e0e6f71
|
修改<进路交自动控><进路收人工控><办理引导>的逻辑；修改引导信号开启时间为30秒
|
2021-01-21 11:24:00 +08:00 |
|
|
|
6b843ad147
|
取消<区段占用进路不排列配置项>；修改<区段强解>逻辑；<查询需要排列的进路>逻辑中添加<触发进路检查>逻辑
|
2021-01-20 19:37:21 +08:00 |
|
|
|
da922a6e31
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-20 18:56:06 +08:00 |
|
|
|
c2d0137c28
|
添加进路排列检查失败日志打印
大客流策略流程
|
2021-01-20 18:55:53 +08:00 |
|
|
|
e0d549600d
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/AtsSectionService.java
|
2021-01-20 16:40:45 +08:00 |
|
|
|
0f5932e1c1
|
修改实训生成bug；针对南京线路添加配置和逻辑
|
2021-01-20 16:03:55 +08:00 |
|
Jade
|
6f6a323d8d
|
客流列车到站上车调整
|
2021-01-20 15:23:46 +08:00 |
|
DU
|
df250b5c71
|
Merge
|
2021-01-20 09:55:00 +08:00 |
|
DU
|
d0c2ed8544
|
应答器逻辑修改
|
2021-01-20 09:13:33 +08:00 |
|
|
|
fef9896703
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-19 19:42:36 +08:00 |
|
|
|
60e7960728
|
联锁生成——延续保护解锁时间添加根据解锁区段长度计算的逻辑
|
2021-01-19 19:42:19 +08:00 |
|
|
|
a4e4884721
|
传输信号机不构建地图数据
|
2021-01-19 18:55:56 +08:00 |
|
|
|
e00262ceb9
|
传输信号机不生成联锁数据
|
2021-01-19 18:41:17 +08:00 |
|
|
|
52986aa9a2
|
将传输信号机联锁数据校验逻辑与其它信号机区分，添加传输信号机的构建逻辑
|
2021-01-19 18:11:44 +08:00 |
|
|
|
bad7cca595
|
进路正常解锁相关道岔解锁逻辑
|
2021-01-19 17:09:48 +08:00 |
|
