|
|
321b4d2b4c
|
修改：前方列车移动授权计算bug
|
2021-07-16 21:57:42 +08:00 |
|
|
|
2793d56431
|
新版头码车逻辑修改（未完）
|
2021-07-16 18:26:01 +08:00 |
|
|
|
08068ebf21
|
修改：ma为null导致的bug
|
2021-07-16 17:12:06 +08:00 |
|
|
|
ce176c1035
|
回滚：添加计划接口
|
2021-07-16 17:05:43 +08:00 |
|
|
|
288dc92579
|
新增：<无关闭锁紧信号>故障
|
2021-07-16 16:43:41 +08:00 |
|
|
|
8df4df4c0f
|
修改：扣车不再影响站台/列车正常关门
|
2021-07-16 11:17:22 +08:00 |
|
|
|
341a8a92bb
|
修改：设置联锁自动触发不再关闭进路自动控（ats进路自动触发逻辑对应修改）
|
2021-07-16 11:16:43 +08:00 |
|
|
|
86dce84b28
|
修改：移动授权计算bug
|
2021-07-16 09:15:19 +08:00 |
|
|
|
8e06b39322
|
Merge remote-tracking branch 'origin/test' into ats-restruct
|
2021-07-15 16:37:14 +08:00 |
|
|
|
645a06cec4
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-07-15 16:35:18 +08:00 |
|
|
|
2ea4672f00
|
修改：移动授权计算bug
|
2021-07-15 16:35:09 +08:00 |
|
|
|
921358002c
|
Merge remote-tracking branch 'origin/test' into ats-restruct
|
2021-07-15 16:29:48 +08:00 |
|
|
|
2d4b40cdb5
|
仿真ats重构-修改车载更新下一计划接口，修改区段进路解锁和延续保护解锁锁闭方向bug，修改CI运行频率为1s
|
2021-07-15 15:03:45 +08:00 |
|
|
|
2b61795f09
|
仿真ats重构-修改进路排列bug，修改获取下一车次计划bug，修改停站时间判断bug
|
2021-07-15 14:07:12 +08:00 |
|
|
|
7eb15b6ad8
|
添加2d模型历史版本分页查询接口
|
2021-07-15 10:56:47 +08:00 |
|
|
|
8ba8d915dc
|
Merge remote-tracking branch 'origin/test' into simulation-new-logic
|
2021-07-15 09:56:13 +08:00 |
|
|
|
d5f0672a57
|
添加郑州共赢小程序配置和登录接口等
添加2d模型历史版本相关接口
|
2021-07-15 09:55:55 +08:00 |
|
|
|
9aa9dc6035
|
头码车逻辑
|
2021-07-15 09:55:40 +08:00 |
|
|
|
f629002d95
|
新增：显示配置
|
2021-07-14 09:37:08 +08:00 |
|
|
|
d8426a5d2d
|
仿真ats重构-列车车载站台逻辑控制bug修改，移动授权距离调整，进路路径区段排序构建bug修改，ATS计划车冲突判断bug修改，计划车更新车次计划未同步到列车车载bug修改
|
2021-07-13 18:21:37 +08:00 |
|
|
|
9e7148525b
|
仿真ats重构-进路区段解锁逻辑修改
|
2021-07-13 15:42:46 +08:00 |
|
|
|
cea1f6de3b
|
Merge remote-tracking branch 'origin/test' into ats-restruct
|
2021-07-13 15:05:17 +08:00 |
|
|
|
1b5a6cc68e
|
修改：前方列车的移动授权计算
|
2021-07-13 14:58:15 +08:00 |
|
|
|
cecfcb1f57
|
Merge remote-tracking branch 'origin/test' into ats-restruct
|
2021-07-13 13:32:56 +08:00 |
|
|
|
9a25867812
|
修改：移动授权计算
|
2021-07-13 13:01:51 +08:00 |
|
|
|
064f64a1ee
|
仿真ats重构-ATS计划车进路触发逻辑调整
|
2021-07-13 11:05:38 +08:00 |
|
|
|
8612c012a9
|
Merge remote-tracking branch 'origin/test' into ats-restruct
|
2021-07-13 10:49:36 +08:00 |
|
|
|
5b1603cca4
|
修改：移动授权计算
|
2021-07-13 10:32:33 +08:00 |
|
|
|
84a47d6183
|
Merge remote-tracking branch 'origin/test' into ats-restruct
|
2021-07-12 17:25:26 +08:00 |
|
|
|
d78c1db2d8
|
仿真ats重构
|
2021-07-12 17:25:17 +08:00 |
|
|
|
792263361e
|
修改：道岔进路/延续保护锁闭并失表时才计算移动授权
|
2021-07-12 17:11:50 +08:00 |
|
|
|
5d61e74415
|
IBP盘bug修改
|
2021-07-12 14:30:30 +08:00 |
|
|
|
a48e863898
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-07-09 10:45:52 +08:00 |
|
|
|
94105ddd88
|
Merge remote-tracking branch 'origin/test' into simulation-ATS-restruct
|
2021-07-08 17:46:33 +08:00 |
|
|
|
afa4228e94
|
仿真ats重构
|
2021-07-08 17:46:13 +08:00 |
|
|
|
30fcdeab8f
|
Merge remote-tracking branch 'origin/test' into simulation-new-logic
|
2021-07-08 15:38:03 +08:00 |
|
|
|
9105e2cb44
|
调试修改2d模型操作相关接口
修改仿真记录bug
修改第三方同步问题
|
2021-07-08 15:37:40 +08:00 |
|
|
|
6137c977bc
|
修改：开关门指令无效bug
|
2021-07-08 15:07:53 +08:00 |
|
|
|
8faf1c9886
|
新增：IBP盘关门按钮；PSL盘关闭且紧锁指示灯
|
2021-07-08 14:44:18 +08:00 |
|
|
|
6a91cfe698
|
Merge remote-tracking branch 'origin/test' into simulation-ATS-restruct
|
2021-07-07 18:07:52 +08:00 |
|
|
|
cec67bc20b
|
修改：设置头码车时的车次校验
|
2021-07-07 18:03:19 +08:00 |
|
|
|
8daaf8743d
|
Merge remote-tracking branch 'origin/test' into simulation-ATS-restruct
|
2021-07-07 17:43:11 +08:00 |
|
|
|
65066fe38f
|
修改：道岔相关移动授权计算
|
2021-07-07 16:24:37 +08:00 |
|
|
|
d76f37c2b0
|
Merge remote-tracking branch 'origin/test' into simulation-ATS-restruct
|
2021-07-07 15:21:20 +08:00 |
|
|
|
85091f8af6
|
修改：IBP盘试灯按钮逻辑修改
|
2021-07-07 11:07:00 +08:00 |
|
|
|
4a39c9bf89
|
修改：进路相关移动授权计算bug
|
2021-07-07 11:02:22 +08:00 |
|
|
|
1948322d80
|
Merge remote-tracking branch 'origin/test' into simulation-ATS-restruct
# Conflicts:
# src/main/java/club/joylink/rtss/simulation/cbtc/data/vo/TrainInfo.java
|
2021-07-07 10:34:31 +08:00 |
|
|
|
679b5012b3
|
修改：进路相关移动授权计算
|
2021-07-07 09:52:51 +08:00 |
|
|
|
6edd259ca7
|
修改：ATO及机器人驾驶逻辑
|
2021-07-06 17:52:50 +08:00 |
|
|
|
910f7a359b
|
修改：进路相关移动授权计算
|
2021-07-06 15:52:33 +08:00 |
|
