Commit Graph

3096 Commits

Author SHA1 Message Date
weizhihong
e8b2b0117e 【步骤ID类型修改】 2022-11-18 15:49:11 +08:00
weizhihong
e9eed02897 【实训删除全前端操作限制】 2022-11-18 14:11:31 +08:00
weizhihong
da4cd76c2a 【实训加载时,增加指令时间控制;实训加载时过滤不必要指令】 2022-11-18 13:51:42 +08:00
weizhihong
9e1448b053 【处理步骤ID】 2022-11-17 16:09:01 +08:00
weizhihong
db55b8b832 【删除步骤ID生成操作】 2022-11-15 16:13:16 +08:00
weizhihong
6d11859981 【修改实训操作属性】 2022-11-15 13:54:27 +08:00
weizhihong
fc950dbd57 【实训保存背景时加载列车,修改生成联锁数据报错问题】 2022-11-15 09:49:16 +08:00
weizhihong
55abfd21b2 【实训草稿存档功能】 2022-11-14 18:07:59 +08:00
tiger_zhou
26d8683e76 武汉8号线合并test 代码调整 2022-11-10 13:24:31 +08:00
tiger_zhou
894ce10b40 Merge branch 'test' into test-training2-zhouyin
# Conflicts:
#	pom.xml
#	src/main/java/club/joylink/rtss/services/iscs/interactive/IscsInteractiveService.java
#	src/main/java/club/joylink/rtss/services/voice/huawei/HuaweiVoiceServiceImpl.java
#	src/main/java/club/joylink/rtss/simulation/cbtc/ATS/operation/Operation.java
#	src/main/java/club/joylink/rtss/simulation/cbtc/data/vo/TrainInfo.java
#	src/main/java/club/joylink/rtss/simulation/cbtc/message/SimulationSubscribeTopic.java
#	src/main/java/club/joylink/rtss/vo/client/factory/SocketMessageFactory.java
#	src/main/resources/application.yml
2022-11-10 11:27:44 +08:00
tiger_zhou
c5b680b8eb 武汉8号线 2022-11-10 11:06:07 +08:00
tiger_zhou
3cd2f52f38 武汉8号线 2022-11-10 10:28:07 +08:00
weizhihong
a5a0b3f105 【实训完成后评分统计】 2022-11-09 10:02:11 +08:00
e379a0a95f 增加订阅设备状态时发送所有设备状态逻辑 2022-11-08 10:16:52 +08:00
b4f7b305b6 新版仿真恢复大客流任务加载逻辑 2022-11-07 18:01:04 +08:00
tiger_zhou
380bc6df65 用户权限同步调整,北交大登录按照通用方式 2022-11-07 17:11:50 +08:00
f132220891 Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-11-07 17:08:59 +08:00
8092557b56 增加ws路径;增加Dom参数 2022-11-07 17:08:43 +08:00
tiger_zhou
502db59fdc 用户权限同步调整 2022-11-04 11:00:05 +08:00
tiger_zhou
b415133f5e 用户权限同步调整 2022-11-04 10:56:16 +08:00
6eecb0e6bc Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-11-03 17:38:46 +08:00
4cff884c4b 增加生成大客流线路功能接口 2022-11-03 17:38:33 +08:00
tiger_zhou
741494e965 用户权限同步调整 2022-11-03 16:46:59 +08:00
f56eb47d53 Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-11-03 16:17:17 +08:00
a2b3e9f282 增加生成应急调度线路功能逻辑;前端配置增加大客流 2022-11-03 16:15:52 +08:00
tiger_zhou
4a6454d6ae Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
 Conflicts:
	src/main/java/club/joylink/rtss/simulation/cbtc/SimulationServiceImpl.java
2022-11-03 15:50:13 +08:00
tiger_zhou
76d9ce5339 用户权限同步 2022-11-03 15:48:13 +08:00
c0c2e81ebf 增加仿真工作参数变更后发送ws消息逻辑; 2022-11-03 15:37:17 +08:00
weizhihong
19775a11ce 【删除多余jar】 2022-11-02 17:03:06 +08:00
001e343459 大铁生成子系统增加综合演练和实训设计 2022-11-02 15:58:35 +08:00
28ff6dd8d9 Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-11-02 13:44:59 +08:00
329a36ef48 增加通过地图功能id创建仿真的接口 2022-11-02 13:44:43 +08:00
tiger_zhou
539c41ba85 客户端权限列表 2022-11-01 10:42:38 +08:00
5a197b5e90 修改仿真不加载运行图bug 2022-10-31 15:54:42 +08:00
ddfa763746 地图子系统改线路功能 2022-10-31 14:31:56 +08:00
784918e8f1 消除报错 2022-10-31 13:58:22 +08:00
617e72bfb0 消除报错 2022-10-31 13:50:37 +08:00
a0c8c424be Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-10-31 13:41:39 +08:00
6d55b7fd2d 地图子系统Dom配置增加实训设计 2022-10-31 13:41:14 +08:00
weizhihong
06089d5e24 【删除操作websocket提示】
【实训步骤全部为前端操作时,交于前端执行,后端只判断步骤状态】
2022-10-31 13:40:39 +08:00
tiger_zhou
9e26790cf8 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-10-28 16:50:28 +08:00
tiger_zhou
fe4190deb7 试卷支持线路 2022-10-28 16:50:14 +08:00
weizhihong
8e2d2e6a01 【修改实训发布轨迹表名】 2022-10-28 16:46:11 +08:00
tiger_zhou
e1d431ecb6 试卷生成代码调整(支持线路) 2022-10-28 16:01:53 +08:00
tiger_zhou
aedab56c37 Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-10-28 15:59:04 +08:00
tiger_zhou
507c8fc83f 试卷生成代码调整(支持线路) 2022-10-28 15:58:50 +08:00
weizhihong
f226d2eb76 【实训规则测试类】 2022-10-28 15:16:27 +08:00
weizhihong
8eab737a64 【实训规则生成实训逻辑】 2022-10-28 15:14:29 +08:00
tiger_zhou
fddaddb699 试卷生成代码调整 2022-10-28 13:47:44 +08:00
tiger_zhou
93c32f9d32 试卷生成代码调整 2022-10-28 13:34:18 +08:00