|
|
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 |
|
|
|
fa3a17c63e
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-19 17:02:30 +08:00 |
|
|
|
3742523aee
|
实现<强扳道岔>操作；进路正常解锁道岔时，添加<尝试解锁联动道岔和计轴关联道岔>逻辑
|
2021-01-19 17:01:34 +08:00 |
|
|
|
d6a5120ccb
|
去掉<进路关联屏蔽门开门时关闭始端信号机>的逻辑
|
2021-01-19 14:34:17 +08:00 |
|
|
|
a60106dedc
|
屏蔽门关门去掉对信号机状态的检查
|
2021-01-19 13:32:25 +08:00 |
|
|
|
f0b8778bfb
|
去掉进路办理时对非CBTC进路的延续保护锁闭状态检查；添加<取消设置>操作；添加<传输信号机>绘图数据
|
2021-01-19 11:19:24 +08:00 |
|
|
|
25e16b83ea
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-19 10:37:07 +08:00 |
|
|
|
c2e1bca38c
|
ATS出库和折返进路触发问题修改
|
2021-01-19 10:36:48 +08:00 |
|
|
|
3b99e3f5ea
|
恢复并修改<进路经过的站台轨所属的站台的屏蔽门未关闭时，关闭信号机>为非CBTC级别下检查
|
2021-01-18 17:24:06 +08:00 |
|
|
|
ad529992af
|
信号机添加<所属车站>绘图属性；交出控制权添加<控制权所属校验>
|
2021-01-18 16:22:19 +08:00 |
|
|
|
35409a3901
|
进路封锁操作，取消<进路锁闭的区段不处理>的逻辑
|
2021-01-18 13:38:37 +08:00 |
|
|
|
426ae9f775
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-15 18:40:11 +08:00 |
|
|
|
843e2c94a5
|
联锁生成逻辑在生成侧防时，进路道岔生成bug修改
仿真（西门子）联锁逻辑完善，和调试
|
2021-01-15 18:39:57 +08:00 |
|
DU
|
1f82cf3deb
|
应答器逻辑补充
|
2021-01-15 17:06:58 +08:00 |
|
|
|
cfe95ad538
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-15 13:00:09 +08:00 |
|
DU
|
d399df63de
|
岔心校验bug
|
2021-01-15 11:11:24 +08:00 |
|
|
|
d65a01fcd9
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-15 11:04:42 +08:00 |
|
DU
|
413a025023
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-01-15 10:40:56 +08:00 |
|
DU
|
6b03677e54
|
岔心 应答器数据对象，应答器逻辑未完
|
2021-01-15 10:39:46 +08:00 |
|
|
|
45c349dff8
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-15 09:59:27 +08:00 |
|
|
|
1567647be2
|
微信支付
|
2021-01-15 09:59:01 +08:00 |
|
|
|
f29fadfbc6
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-14 19:07:51 +08:00 |
|
|
|
eeeec1db01
|
联锁侧防数据生成、保存、仿真构建流程调试修改
联锁进路控制添加侧防逻辑（延续保护侧防逻辑还没有加），触发区段使用逻辑区段
联锁进路信号机添加 "级别" 概念和逻辑
|
2021-01-14 19:07:32 +08:00 |
|
|
|
8eb906de23
|
联锁侧防数据生成、保存、仿真构建
|
2021-01-13 18:42:17 +08:00 |
|
DU
|
13f5dd8142
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-01-13 10:41:49 +08:00 |
|
