weizhihong
|
88d9ae234c
|
Merge branch 'test'
|
2023-06-07 18:01:10 +08:00 |
|
joylink_zhangsai
|
9001cb5df9
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# src/main/java/club/joylink/rtss/simulation/cbtc/robot/SimulationRobotService.java
|
2023-06-07 17:56:08 +08:00 |
|
joylink_zhangsai
|
6a9b4c43c9
|
修改泰国沙盘逻辑，提高UDP真实设备逻辑运行速度
|
2023-06-07 17:54:58 +08:00 |
|
weizhihong
|
4937d22a0d
|
【回库匹配逻辑】
|
2023-06-07 16:21:15 +08:00 |
|
weizhihong
|
bf7f8510be
|
【连挂车停位BUG】
|
2023-06-07 16:02:59 +08:00 |
|
weizhihong
|
389f393a7d
|
【道岔转动联动处理】
|
2023-06-07 14:41:47 +08:00 |
|
weizhihong
|
8764511650
|
【学生成绩统计BUG】
|
2023-06-07 10:16:20 +08:00 |
|
weizhihong
|
c84538bc4f
|
【修改连挂后，故障车到达位置】
|
2023-06-07 08:55:21 +08:00 |
|
weizhihong
|
8cb9d9bb84
|
【回库BUG】
|
2023-06-06 17:01:37 +08:00 |
|
weizhihong
|
4de0b5e0e8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2023-06-06 16:42:35 +08:00 |
|
weizhihong
|
c13e5ab742
|
【连挂车设置驾驶目的地时，给故障车赋值】
|
2023-06-06 16:42:29 +08:00 |
|
tiger_zhou
|
ba5ec61c5e
|
应急调度日志
|
2023-06-06 16:01:34 +08:00 |
|
tiger_zhou
|
c9c8c75be3
|
应急调度日志
|
2023-06-06 13:49:29 +08:00 |
|
joylink_zhangsai
|
b70d829c65
|
Merge remote-tracking branch 'origin/test' into test
|
2023-06-05 11:42:12 +08:00 |
|
joylink_zhangsai
|
b41ea03502
|
泰国沙盘禁用列车自动上线逻辑
|
2023-06-05 11:41:59 +08:00 |
|
tiger_zhou
|
a6f75d5cbf
|
考试回调参数
|
2023-06-05 10:48:25 +08:00 |
|
joylink_zhangsai
|
5cc2c02ccc
|
修改本地环境的数据连接配置
|
2023-06-04 18:45:39 +08:00 |
|
joylink_zhangsai
|
7d678f3d61
|
泰国沙盘停站延时改动
|
2023-06-04 18:28:16 +08:00 |
|
joylink_zhangsai
|
74b9ab80da
|
泰国沙盘调试改动
|
2023-06-04 17:23:46 +08:00 |
|
weizhihong
|
f968066501
|
Merge branch 'test'
|
2023-06-01 18:27:55 +08:00 |
|
weizhihong
|
f3ec423779
|
【实训导出BUG修复】
|
2023-06-01 18:26:29 +08:00 |
|
weizhihong
|
8f9316c3c9
|
Merge branch 'test'
|
2023-06-01 18:18:27 +08:00 |
|
weizhihong
|
ec6e78dbcb
|
【进路解锁逻辑修改】
|
2023-06-01 15:38:37 +08:00 |
|
weizhihong
|
dad1bfc982
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2023-06-01 14:37:30 +08:00 |
|
weizhihong
|
c23d97ae86
|
【红光带引导，进路取消逻辑修改】
|
2023-06-01 14:37:24 +08:00 |
|
tiger_zhou
|
daee0d2c67
|
Merge remote-tracking branch 'origin/test'
|
2023-06-01 09:11:59 +08:00 |
|
tiger_zhou
|
a1be780b13
|
南宁设备逻辑
|
2023-06-01 09:00:34 +08:00 |
|
tiger_zhou
|
35b9f0cca2
|
Merge remote-tracking branch 'origin/test'
|
2023-05-31 16:07:29 +08:00 |
|
tiger_zhou
|
966c70cd2f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-zy
|
2023-05-31 16:06:16 +08:00 |
|
tiger_zhou
|
3189b6b51a
|
南宁设备逻辑
|
2023-05-31 16:05:48 +08:00 |
|
weizhihong
|
a1a9929f4d
|
【实训加载到某步出现提示BUG】
【角色替换扮演置NULL问题】
【信号机增加引导关键道岔属性】
|
2023-05-31 15:20:43 +08:00 |
|
weizhihong
|
4e5e83202c
|
【IBP按钮时间使用仿真时间处理】
|
2023-05-30 17:30:53 +08:00 |
|
tiger_zhou
|
38c30520f4
|
武汉8修改日志
|
2023-05-30 16:49:45 +08:00 |
|
weizhihong
|
72024821b0
|
【增加IBP计轴复位预处理逻辑】
|
2023-05-30 16:46:18 +08:00 |
|
tiger_zhou
|
6cfa675ead
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-zy
|
2023-05-30 16:39:33 +08:00 |
|
tiger_zhou
|
25fbd9a715
|
武汉8
|
2023-05-30 16:39:06 +08:00 |
|
weizhihong
|
0a8082ed97
|
【无群组信息是给默认数据】
|
2023-05-30 15:52:41 +08:00 |
|
weizhihong
|
d9812813d7
|
【多人仿真调用接口时，修改实训状态】
|
2023-05-30 14:43:53 +08:00 |
|
tiger_zhou
|
33dbc54fd9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-zy
|
2023-05-30 13:54:29 +08:00 |
|
weizhihong
|
0be6e02563
|
【处理实训结束操作时，暂停导致结束消息不发送问题】
|
2023-05-30 13:48:43 +08:00 |
|
weizhihong
|
488ec0a7a4
|
【增加实训开始结束状态消息】
|
2023-05-30 10:43:40 +08:00 |
|
weizhihong
|
cda1272d08
|
【发布实训导出去除地图ID】【实训加载增加模式参数】
|
2023-05-29 17:52:53 +08:00 |
|
tiger_zhou
|
06d4e50192
|
记录
|
2023-05-29 16:46:06 +08:00 |
|
weizhihong
|
07f8bcbd16
|
【上电解锁状态提交】
|
2023-05-29 16:23:07 +08:00 |
|
weizhihong
|
b505dcdbfe
|
【多人实训开始前发送实训ID消息】
|
2023-05-29 14:13:09 +08:00 |
|
weizhihong
|
2596ad3085
|
【上电解锁按钮】
|
2023-05-29 11:14:54 +08:00 |
|
tiger_zhou
|
6b30e5c066
|
Merge remote-tracking branch 'origin/test'
|
2023-05-29 09:39:49 +08:00 |
|
tiger_zhou
|
ecdf3de890
|
部署过滤
|
2023-05-29 09:14:00 +08:00 |
|
weizhihong
|
68b4c0af01
|
【导入、导出实训接口】
|
2023-05-26 18:06:59 +08:00 |
|
tiger_zhou
|
ee3f242162
|
部署过滤
|
2023-05-26 17:07:05 +08:00 |
|