|
|
9259fd123b
|
Merge branch 'test'
|
2023-09-27 18:09:23 +08:00 |
|
tiger_zhou
|
cf24e2e7f9
|
调整
|
2023-09-27 18:04:35 +08:00 |
|
tiger_zhou
|
42d36d8812
|
Merge remote-tracking branch 'origin/test' into test
|
2023-09-27 17:55:14 +08:00 |
|
tiger_zhou
|
f6021e9a2d
|
删除自己的实训数据，出现共享数据不能删除的错误
|
2023-09-27 17:53:59 +08:00 |
|
|
|
e2cd83d298
|
实训场景编制时，将控制权转换相关消息暂存，后续再发送；增加[车站站长]和[站务员]角色
|
2023-09-27 15:47:05 +08:00 |
|
|
|
d7b42ef478
|
修改数据构建bug
|
2023-08-29 16:53:26 +08:00 |
|
joylink_zhangsai
|
99ecac0318
|
修改ngy项目设备生成逻辑
|
2023-08-18 15:10:55 +08:00 |
|
joylink_zhangsai
|
8b85c0a63b
|
运行图编制，复制计划时，按照源计划的服务号位数决定新服务号位数
|
2023-08-18 09:51:32 +08:00 |
|
|
|
b4bb689dc5
|
增加南工院沙盘服务
|
2023-08-14 13:11:05 +08:00 |
|
|
|
813d13d768
|
添加新设备类型
|
2023-07-06 11:13:42 +08:00 |
|
|
|
c686a8d23e
|
泰国沙盘删除多次出清才算出清逻辑
|
2023-06-13 10:32:50 +08:00 |
|
|
|
3c6cb3a994
|
泰国沙盘增加进路解锁逻辑
|
2023-06-12 15:54:42 +08:00 |
|
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 |
|
