weizhihong
|
b666ac0bd7
|
【将項目前端配置与后端配置分离，处理重新处理表结构】
|
2022-09-23 16:48:48 +08:00 |
|
weizhihong
|
5524b4c043
|
【增加获取项目前端配置接口】
|
2022-09-23 14:01:26 +08:00 |
|
weizhihong
|
76f86bcc96
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
# Conflicts:
# src/main/java/club/joylink/rtss/controller/competition/question/QuestionBankController2.java
|
2022-09-23 13:28:36 +08:00 |
|
weizhihong
|
f482aa32aa
|
【项目配置信息修改，枚举相关修改为string】
|
2022-09-23 13:25:15 +08:00 |
|
tiger_zhou
|
0b8a0ca0d6
|
理论试题管理代码调整
|
2022-09-23 13:02:06 +08:00 |
|
tiger_zhou
|
f8efdbc965
|
理论试题管理代码调整
|
2022-09-22 17:43:12 +08:00 |
|
tiger_zhou
|
a6ccd7dc81
|
理论试题管理代码调整
|
2022-09-22 17:27:05 +08:00 |
|
tiger_zhou
|
8536894aaa
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-09-22 17:26:35 +08:00 |
|
xzb
|
4d04c643ae
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-09-22 17:25:29 +08:00 |
|
xzb
|
979ea72d52
|
paper
|
2022-09-22 17:25:12 +08:00 |
|
weizhihong
|
23f2494de7
|
【项目配置相关、实训操作参数对比】
|
2022-09-22 16:55:51 +08:00 |
|
tiger_zhou
|
48afcf791e
|
理论试题管理代码调整
|
2022-09-22 16:24:39 +08:00 |
|
tiger_zhou
|
8831a0515f
|
理论试题管理代码调整
|
2022-09-22 14:38:01 +08:00 |
|
tiger_zhou
|
2d2d0fc459
|
理论试题管理
|
2022-09-22 14:23:21 +08:00 |
|
weizhihong
|
3a2803bb5e
|
【项目配置管理接口】
|
2022-09-22 13:36:03 +08:00 |
|
xzb
|
e854308724
|
调度命令
|
2022-09-22 10:13:55 +08:00 |
|
xzb
|
c68142f798
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-09-21 17:39:31 +08:00 |
|
xzb
|
93f871da54
|
调度命令
|
2022-09-21 17:38:21 +08:00 |
|
tiger_zhou
|
226d5d62b1
|
理论试题管理
|
2022-09-21 17:26:58 +08:00 |
|
|
|
c76b9cc104
|
修改PIS/PA ws消息发送bug
|
2022-09-20 18:15:02 +08:00 |
|
|
|
d819e8a190
|
修改小bug
|
2022-09-20 17:25:23 +08:00 |
|
tiger_zhou
|
542c7da98e
|
Merge remote-tracking branch 'origin/test' into test-training2
|
2022-09-20 16:53:21 +08:00 |
|
tiger_zhou
|
9b5c3b2dbc
|
Merge branch 'test' into test-training2-zhouyin
# Conflicts:
# src/main/java/club/joylink/rtss/constants/MapPrdTypeEnum.java
# src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/NewAtsTrainLoadService.java
# src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/TrainPositionService.java
# src/main/java/club/joylink/rtss/simulation/cbtc/SimulationLifeCycleServiceImpl.java
# src/main/java/club/joylink/rtss/vo/client/factory/SocketMessageFactory.java
# src/main/java/club/joylink/rtss/vo/ws/TrainPosition.java
# src/main/java/club/joylink/rtss/websocket/WebSocketController.java
# src/main/java/club/joylink/rtss/websocket/WebsocketConfig.java
# src/main/java/club/joylink/rtss/websocket/client/StompClientManager.java
|
2022-09-20 16:48:27 +08:00 |
|
tiger_zhou
|
de0b411191
|
1
|
2022-09-20 16:41:34 +08:00 |
|
|
|
ffd71ef83c
|
PA/PIS功能
|
2022-09-20 16:29:01 +08:00 |
|
xzb
|
8b7f9ef947
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-09-19 18:09:44 +08:00 |
|
xzb
|
7f8b0394b6
|
调度命令
|
2022-09-19 18:09:26 +08:00 |
|
weizhihong
|
5a640d7b98
|
【当全部清除后，再次添加步骤时问题】
|
2022-09-19 15:49:07 +08:00 |
|
weizhihong
|
722532cf0f
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
|
2022-09-19 15:08:27 +08:00 |
|
weizhihong
|
da0d5d6953
|
【保存步骤时，处理已经删除的打分规则】
|
2022-09-19 15:08:08 +08:00 |
|
xzb
|
4015a5f2fd
|
通过地图逻辑数据存储调度台数据
|
2022-09-19 15:05:58 +08:00 |
|
|
|
a0b83e8749
|
Merge remote-tracking branch 'origin/test' into test
|
2022-09-19 09:16:00 +08:00 |
|
xzb
|
9c14994eec
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-09-16 17:03:25 +08:00 |
|
xzb
|
bb5fabbec0
|
调度命令-转发
|
2022-09-16 17:03:05 +08:00 |
|
tiger_zhou
|
37948d68fe
|
武汉8号线列车位置显示功能调整
|
2022-09-16 16:24:24 +08:00 |
|
tiger_zhou
|
361675fb9f
|
武汉8号线列车位置显示功能调整
|
2022-09-16 16:10:44 +08:00 |
|
weizhihong
|
7bc5c11e5d
|
【删除实训仿真暂停操作】
|
2022-09-16 15:57:36 +08:00 |
|
weizhihong
|
8d3d31c94f
|
【车站实训模式说明修改】
|
2022-09-16 13:51:13 +08:00 |
|
xzb
|
1741d5ed12
|
实训草稿发布优化
|
2022-09-16 10:24:47 +08:00 |
|
xzb
|
6293a2a54b
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-09-15 17:40:43 +08:00 |
|
xzb
|
1e9d953c3b
|
调度命令-调度台调度
|
2022-09-15 17:40:28 +08:00 |
|
weizhihong
|
cc023f94fd
|
【实训结束时，获取分值bug】
|
2022-09-15 16:47:10 +08:00 |
|
xzb
|
07a476bcfe
|
调度命令-调度台调度
|
2022-09-15 16:13:37 +08:00 |
|
tiger_zhou
|
1bcc1063ed
|
武汉8号线列车位置显示功能调整
|
2022-09-15 15:47:10 +08:00 |
|
xzb
|
7b912b5027
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-09-15 15:13:15 +08:00 |
|
xzb
|
a5b0fde841
|
调度命令-地图添加调度台
|
2022-09-15 15:12:59 +08:00 |
|
weizhihong
|
d544413f50
|
【实训操作保存时，生成操作ID】
|
2022-09-15 15:10:00 +08:00 |
|
xzb
|
f0bbb332c0
|
调度命令-地图添加调度台；实训添加发布轨迹追踪；
|
2022-09-15 14:59:47 +08:00 |
|
xzb
|
e236c51863
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-09-15 14:14:36 +08:00 |
|
xzb
|
97d2dab3af
|
调度命令-地图添加调度台；实训添加发布轨迹追踪；
|
2022-09-15 14:14:11 +08:00 |
|
