joylink/rt-sim-training-service
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 10 Wiki Activity
2,658 Commits 12 Branches 10 Tags 54 MiB
6fa2a1b105
Commit Graph

2584 Commits

Author SHA1 Message Date
xzb
6fcf7ca003 paper 2022-09-27 14:54:41 +08:00
xzb
1af3786341 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-09-27 14:53:29 +08:00
tiger_zhou
cbc12523bc 理论试题管理代码调整 2022-09-27 14:51:30 +08:00
tiger_zhou
b5497d4cd3 理论试题管理代码调整 2022-09-27 14:47:26 +08:00
xzb
c90d5d2394 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-09-27 14:22:10 +08:00
xzb
7c3ca92216 paper 2022-09-27 14:21:41 +08:00
tiger_zhou
9cbe835f2b Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-09-27 14:21:11 +08:00
tiger_zhou
3489df9245 理论试题管理代码调整 2022-09-27 14:20:29 +08:00
xzb
30386dc5f6 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-09-26 18:06:18 +08:00
xzb
f12ceb3fce paper 2022-09-26 18:06:02 +08:00
weizhihong
40678cbc72 【清空步骤时，清空最后运行背景】 2022-09-26 13:21:03 +08:00
tiger_zhou
d8079d98f2 理论试题管理代码调整 2022-09-26 13:03:34 +08:00
weizhihong
e6721d69ac 【项目前端设置请求修改】 2022-09-26 11:19:30 +08:00
tiger_zhou
35fd58eb1d Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-09-26 09:57:05 +08:00
tiger_zhou
293588d6cf 修改 project code 参数 2022-09-26 09:56:33 +08:00
weizhihong
17e3268667 【增加项目缓存读取、删除】 2022-09-26 09:52:05 +08:00
tiger_zhou
bfa9b06475 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 
 Conflicts:
	src/main/java/club/joylink/rtss/simulation/cbtc/data/map/MapElement.java
	src/main/java/club/joylink/rtss/simulation/cbtc/data/status/OnboardPisStatus.java
	src/main/java/club/joylink/rtss/simulation/cbtc/pis/PisLogicLoop.java
	src/main/java/club/joylink/rtss/websocket/WebsocketConfig.java
	src/main/java/club/joylink/rtss/websocket/interceptor/VSimpleInterceptor.java
 2022-09-26 09:50:34 +08:00
tiger_zhou
77f02453f4 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-09-26 09:44:37 +08:00
tiger_zhou
ad8e8963c6 正式环境 ws config 对象属性 ISysUserService 造成循环依赖 添加lazy注解 2022-09-26 09:42:13 +08:00
xzb
f3e409d430 dis cmd注释 2022-09-26 09:16:37 +08:00
xzb
f48d48f121 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-09-23 18:01:31 +08:00
xzb
a4865e667a paper 2022-09-23 18:01:07 +08:00
tiger_zhou
6ff6eeffec 理论试题管理代码调整 2022-09-23 17:31:22 +08:00
weizhihong
c1f81a6fdf 【创建仿真时，项目为空默认处理；调度台设备为空处理；】 2022-09-23 17:14:39 +08:00
weizhihong
b666ac0bd7 【将項目前端配置与后端配置分离，处理重新处理表结构】 2022-09-23 16:48:48 +08:00
tiger_zhou
1ecd05be32 理论试题管理代码调整 2022-09-23 16:19:21 +08:00
joylink_zhangsai
6a53fbd5a7 PA增加定时播放功能、PIS发布信息修改站台PIS文字 2022-09-23 15:13:31 +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
joylink_zhangsai
6d45e197c2 修改列车信息中的终点站更新逻辑；修改站台PIS的时间计算逻辑 2022-09-21 13:35:19 +08:00
joylink_zhangsai
b57f1977b0 修改PIS/PA ws消息发送bug 2022-09-20 18:17:09 +08:00
joylink_zhangsai
905eda42c4 修改小bug 2022-09-20 18:17:03 +08:00
joylink_zhangsai
c76b9cc104 修改PIS/PA ws消息发送bug 2022-09-20 18:15:02 +08:00
joylink_zhangsai
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
joylink_zhangsai
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
joylink_zhangsai
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
weizhihong
a13daf7c23 【修复实训第一次开始时背景消失BUG】 2022-09-15 13:53:06 +08:00
tiger_zhou
6741341601 武汉8号线列车位置显示功能调整 2022-09-15 13:48:05 +08:00
joylink_zhangsai
a3f29142f8 重置密码、找回密码功能 2022-09-15 13:23:33 +08:00
weizhihong
1ab2452c70 【状态类型为枚举时，判断做处理】 2022-09-15 10:52:30 +08:00
weizhihong
48a28cb7c4 【修改状态判定，解决列车触发条件不生效问题】 2022-09-15 09:09:52 +08:00
weizhihong
1e94f3ae5a 【用户无角色结束实训操作】 2022-09-14 16:11:53 +08:00
xzb
10f9ebc161 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-09-14 15:44:39 +08:00
xzb
cc73a5448f 调度命令 2022-09-14 15:43:38 +08:00
weizhihong
a86c734f44 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2 
# Conflicts:
#	src/main/java/club/joylink/rtss/simulation/cbtc/data/map/Section.java
#	src/main/java/club/joylink/rtss/simulation/cbtc/data/map/Signal.java
#	src/main/java/club/joylink/rtss/simulation/cbtc/data/map/Switch.java
 2022-09-14 14:55:15 +08:00
weizhihong
442f2e436b 【增加进路、区段、信号机、相关枚举描述属性字段；实训返回枚举描述信息】 2022-09-14 14:49:07 +08:00
tiger_zhou
b863f2c87d 武汉8号线列车位置支持订阅返回消息，用户名密码的支持 2022-09-14 14:41:05 +08:00
xzb
4c5225e19d Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-09-14 14:32:33 +08:00
xzb
d1e9c258f0 调度命令 2022-09-14 14:32:16 +08:00
walker_sheng
6f3744f98b 调整部分设备状态注解 2022-09-14 14:31:38 +08:00
weizhihong
9e29a8f360 【修改火车设备状态属性选择】 2022-09-14 10:53:07 +08:00
xzb
8abff77bad 调度命令-回执 2022-09-14 10:28:28 +08:00
xzb
e26221f723 调度命令-消息推送 2022-09-14 09:54:29 +08:00
xzb
5d83ababdc 调度命令-代签 2022-09-13 18:11:22 +08:00
xzb
bf821d9ff8 调度命令-受令单位超时60秒未签收处理 2022-09-13 15:56:15 +08:00
joylink_zhangsai
144f6fef4a Merge remote-tracking branch 'origin/test' into test 2022-09-13 15:39:31 +08:00
joylink_zhangsai
3f7cb3645e WS路径统一 2022-09-13 15:39:03 +08:00
xzb
fa140c96f4 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-09-13 10:20:07 +08:00
xzb
6d05ce3d00 调度命令-调度命令操作接口(仅用于生成smart-doc) 2022-09-13 10:19:47 +08:00
xzb
379281a8a8 调度命令-接口注释完善 2022-09-13 10:18:43 +08:00
tiger_zhou
53c6aac14c 武汉8号线列车位置显示功能调整 2022-09-09 16:42:54 +08:00
tiger_zhou
114be10e1b 武汉8号线列车位置显示功能调整 2022-09-09 16:16:25 +08:00
weizhihong
952e8ea345 【调整实训提示消息结构】 2022-09-09 15:15:27 +08:00
tiger_zhou
b425e5b36b 武汉8号线列车位置显示功能调整 2022-09-09 13:45:04 +08:00
tiger_zhou
ed45ab1c71 Merge branch 'test-zhouyin' into test 2022-09-09 13:40:42 +08:00
tiger_zhou
e24bfbcafe 武汉8号线列车位置显示功能调整 2022-09-09 13:40:25 +08:00
tiger_zhou
88c0ac23b0 Merge branch 'test-zhouyin' into test 2022-09-09 13:33:49 +08:00
tiger_zhou
c6c26ff40a 武汉8号线列车位置显示功能调整 2022-09-09 13:33:29 +08:00
joylink_zhangsai
d57a288ae0 进路首区段占用时联锁等级只能到引导级 2022-09-09 11:03:33 +08:00
tiger_zhou
37063e02ed Merge remote-tracking branch 'origin/test' into test 2022-09-09 10:17:58 +08:00
tiger_zhou
4d0205f578 同步站细功能 2022-09-09 10:17:26 +08:00
weizhihong
f2ab803993 【刷新仿真时，会话信息转VO问题出错】 2022-09-09 10:15:37 +08:00
weizhihong
d815c99f0f 【大铁实训语音校验逻辑修改】 2022-09-09 10:07:09 +08:00
joylink_zhangsai
b75dbe6b3d Merge remote-tracking branch 'origin/master-huawei' into test 2022-09-09 09:20:29 +08:00
xzb
81698a389f 调度命令 2022-09-09 09:03:30 +08:00
tiger_zhou
eaf30840a1 武汉8号线列车位置显示功能调整 2022-09-09 08:51:33 +08:00
thesai
52625cce1d 红河财经现场部署 2022-09-08 23:23:10 +08:00
xzb
dbe7f90f3e Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-09-08 18:14:59 +08:00
xzb
94bd30b06b 调度命令 2022-09-08 18:14:42 +08:00
tiger_zhou
5d66e5ae09 武汉8号线列车位置显示功能调整 2022-09-08 18:04:05 +08:00
weizhihong
04b7a35a6b 【步骤为空时，保存出错】 2022-09-08 17:32:48 +08:00
tiger_zhou
a13eaceeee 武汉8号线列车位置显示功能调整 2022-09-08 17:09:31 +08:00
tiger_zhou
1363355e8f 武汉8号线列车位置显示功能调整，调整菜单 2022-09-08 15:36:26 +08:00
xzb
8ff182e6e7 调度命令 2022-09-08 15:15:24 +08:00
xzb
c9538a39be 调度命令 2022-09-08 15:14:23 +08:00
tiger_zhou
45ac716355 武汉8号线列车位置显示功能调整 2022-09-08 13:44:55 +08:00
tiger_zhou
9565b2f31a 武汉8号线列车位置显示功能调整 2022-09-08 13:13:59 +08:00
xzb
de2a86f34f 调度命令 2022-09-08 11:09:12 +08:00
xzb
507459e233 调度命令 2022-09-08 10:32:46 +08:00
xzb
0dcb7dc9b3 调度命令 2022-09-08 09:46:19 +08:00
tiger_zhou
0194749610 武汉8号线列车位置显示功能 2022-09-07 18:35:17 +08:00
tiger_zhou
d3aea82953 武汉8号线列车位置显示功能 2022-09-07 18:30:19 +08:00
tiger_zhou
5916cd765e 武汉8号线列车位置显示功能 2022-09-07 18:12:32 +08:00
xzb
f2d285f022 调度命令 2022-09-07 18:06:57 +08:00
xzb
6a05030c7a Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-09-07 17:43:06 +08:00
xzb
3387034a66 调度命令 2022-09-07 17:42:33 +08:00
tiger_zhou
b42794e45b Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-09-07 17:19:13 +08:00
tiger_zhou
4df36e6ccf 武汉8号线列车位置显示功能 2022-09-07 17:17:35 +08:00
tiger_zhou
67be44750a 武汉8号线列车位置显示功能 2022-09-07 17:15:54 +08:00
tiger_zhou
41fe8bba1c 武汉8号线列车位置显示功能 2022-09-07 16:39:55 +08:00
weizhihong
faeef7a0ea 【实训重新开始时状态未初始化问题】 2022-09-07 15:04:17 +08:00
weizhihong
1308e569c1 【指标计算逻辑】 2022-09-07 14:10:10 +08:00
xzb
c80828e388 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-09-07 14:02:19 +08:00
xzb
f9eb48625f 调度命令 2022-09-07 14:01:06 +08:00
weizhihong
101956f8d6 【修改指标属性类型】 2022-09-07 10:48:28 +08:00
weizhihong
9b8080d5f3 【实训指标计算加入操作参数】 2022-09-07 10:41:06 +08:00
weizhihong
cc7d57a511 【指标操作对应，创建指标操作类，指标统计类型】 2022-09-07 10:28:19 +08:00
tiger_zhou
753c314292 武汉8号线列车位置显示功能 2022-09-07 10:01:58 +08:00
tiger_zhou
7065625895 Merge branch 'test' into test-training2-zhouyin 2022-09-07 08:58:05 +08:00
tiger_zhou
6a3c4ad645 武汉8号线列车位置显示功能 2022-09-07 08:57:34 +08:00
xzb
a7ff59fc91 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-09-06 18:03:11 +08:00
xzb
52ac4d1d63 调度命令 2022-09-06 18:02:56 +08:00
weizhihong
eb84b0cf15 【实训指标计算】 2022-09-06 17:10:09 +08:00
xzb
e9cc4510b4 调度命令 2022-09-06 16:59:28 +08:00
xzb
8ac5de29eb Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-09-05 18:19:55 +08:00
xzb
335590cd0c 调度命令 2022-09-05 18:19:34 +08:00
weizhihong
6a76691b2c 【实训消息修改为事件触发、增加指标计算流程事件】 2022-09-05 16:53:28 +08:00
tiger_zhou
786e0e58a9 车务管理终端功能代码调整 2022-09-05 15:32:16 +08:00
tiger_zhou
67938c6597 武汉8号线区段添加公里标属性 2022-09-05 15:13:37 +08:00
xzb
a20441b1ec Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-09-05 13:06:43 +08:00
xzb
9d0677cf51 实训草稿发布重命名 2022-09-05 13:06:22 +08:00
tiger_zhou
fbdbd33e49 Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-09-05 12:27:55 +08:00
tiger_zhou
5c4dc62ac8 车务管理终端功能代码调整 2022-09-05 12:25:30 +08:00
xzb
a1a6d69d8f 大铁调度命令-select 2022-09-05 11:18:01 +08:00
xzb
43898ba1f2 大铁调度命令-receiversManager 2022-09-05 09:24:12 +08:00
xzb
9c3b6487cd 大铁调度命令 2022-09-02 18:05:08 +08:00
xzb
71d735a7cb Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-09-02 18:04:45 +08:00
weizhihong
b0ed14c484 【区段故障类型反序列化问题】 2022-09-02 17:29:03 +08:00
weizhihong
84955a996b 【草稿同名检验、发布同名检验】 2022-09-02 16:48:43 +08:00
weizhihong
2486637175 【个人草稿添加时重名判断】 2022-09-02 15:59:05 +08:00
weizhihong
8d195c5367 【前端重复点击时、后端报错问题】 2022-09-02 11:10:22 +08:00
tiger_zhou
7411b52328 Merge branch 'test-training2-zhouyin' into test-training2 2022-09-02 09:31:59 +08:00
tiger_zhou
98742d923a 车务管理终端功能代码调整 2022-09-02 09:31:19 +08:00
weizhihong
8e6060eaa2 【优化实训加载速度，结束后直接获取下一步】 2022-09-01 18:39:33 +08:00
xzb
6922e2630e 大铁调度命令数据流转实现 2022-09-01 18:09:38 +08:00
tiger_zhou
5e4d85443d 车务管理终端功能代码调整 2022-09-01 18:03:06 +08:00
tiger_zhou
efb101d281 车务管理终端功能代码调整 2022-09-01 17:31:38 +08:00
tiger_zhou
9d1677128f Merge branch 'test-zhouyin' into test-training2-zhouyin 2022-09-01 14:00:03 +08:00
tiger_zhou
e646435e04 车务管理终端功能代码调整及计划支持股道，出入口与站细不一致的支持 2022-09-01 13:57:43 +08:00
xzb
e643b7df9f 大铁调度命令数据流转实现 2022-09-01 10:39:49 +08:00
weizhihong
11095aa217 【保存实训最后运行状态】 2022-08-31 17:10:32 +08:00
weizhihong
da9355b9a7 【优化实训运行、增加步骤定位信息字段】 2022-08-31 16:53:34 +08:00
weizhihong
d55d038c06 【结束实训返回分数、保存步骤时保存人员信息、重新开始时重置仿真状态】 2022-08-31 13:34:03 +08:00
weizhihong
ea3667a80d 【再次加载实训没有背景BUG、判断完成条件BUG】 2022-08-31 11:03:20 +08:00
weizhihong
4ce9d4b885 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2 
# Conflicts:
#	src/main/java/club/joylink/rtss/services/training2/Training2Service.java
 2022-08-31 10:49:30 +08:00
weizhihong
cc4463ef5f 【修改步骤、操作运行状态】 2022-08-31 10:44:29 +08:00
joylink_zhangsai
ff0827c811 实训评分规则数据及逻辑 2022-08-30 17:41:21 +08:00
xzb
bed5a7aa69 Training2DraftService优化 2022-08-30 14:31:20 +08:00
xzb
9a3cc981de Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-08-30 14:22:42 +08:00
xzb
a2d5c6b007 Training2DraftService优化 2022-08-30 14:21:35 +08:00
weizhihong
4ddf7b99d5 【增加实训无背景加载判断】 2022-08-30 14:21:11 +08:00
weizhihong
15a5cdf6c9 【实训再开始时，重新加载背景】 2022-08-30 13:40:35 +08:00
weizhihong
db4a3f10c8 【结束实训时，不存在实训BUG】 2022-08-30 13:18:19 +08:00
weizhihong
9e42a4ce68 Merge branch 'test' into test-training2 2022-08-29 18:15:02 +08:00
xzb
75f7d95285 Station 实训相关注解 2022-08-29 16:52:17 +08:00
xzb
8aaf7c6d34 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-08-29 15:57:24 +08:00
xzb
3221f12f37 ExpConditionMaterialSrcAnno 添加属性name 2022-08-29 15:57:04 +08:00