Commit Graph

3304 Commits

Author SHA1 Message Date
tiger_zhou
712da01cc3 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2023-01-31 14:13:19 +08:00
tiger_zhou
68bbde3029 考试规则数量,标签 针对实训线路过滤调整 2023-01-31 10:57:44 +08:00
weizhihong
ce21de71ba 【非正常情况接发列车关键环节控制表信息保存、更新、查询操作】 2023-01-31 10:42:15 +08:00
tiger_zhou
fc5b8721b7 考试生成试卷,考试规则数量,标签 针对实训线路过滤 2023-01-31 10:11:45 +08:00
tiger_zhou
40875c44db Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2023-01-31 10:08:18 +08:00
5337333402 Merge remote-tracking branch 'origin/test-training2' into test-training2 2023-01-30 17:42:15 +08:00
8d9e571566 修改大铁调车进路生成逻辑 2023-01-30 17:42:01 +08:00
tiger_zhou
9c360f0788 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2023-01-30 17:21:55 +08:00
tiger_zhou
a5691df153 调整考试实训类型类型属性无法找到问题 2023-01-30 11:11:23 +08:00
weizhihong
6f9d9bf5b7 【修改出入口卡控默认值】 2023-01-30 09:40:01 +08:00
weizhihong
39d7bd76bf 【实训更新步骤是用户角色列表自然排序】 2023-01-18 14:44:01 +08:00
weizhihong
27adab3586 【大铁列车到点上线逻辑修改】 2023-01-18 10:19:36 +08:00
weizhihong
97184b1867 【大铁调度命令背景保存】 2023-01-17 16:43:57 +08:00
a0580a6435 Merge remote-tracking branch 'origin/test-training2' into test-training2 2023-01-17 15:54:33 +08:00
94e6169138 增加仿真加载草稿运行图接口 2023-01-17 15:54:16 +08:00
weizhihong
327c883c5b 【大铁调度台重置方法】 2023-01-17 14:16:51 +08:00
456d0d8f1f 修改加载实训时的重置仿真接口 2023-01-17 10:21:41 +08:00
689ab3155a Merge remote-tracking branch 'origin/test-training2' into test-training2 2023-01-16 16:09:33 +08:00
6857404403 地图数据增加可访问客户端集合;大铁重置仿真增加按计划行车(之前认为大铁应自动按计划行车) 2023-01-16 16:09:22 +08:00
weizhihong
929c9a1e05 【大铁实训保存背景BUG】 2023-01-16 16:00:15 +08:00
tiger_zhou
7aabe2822b training2 合并 2023-01-16 10:46:10 +08:00
tiger_zhou
f85636942d Merge remote-tracking branch 'origin/test-training2' into test
# Conflicts:
#	src/main/java/club/joylink/rtss/simulation/cbtc/GroupSimulationServiceImpl.java
#	src/main/resources/application.yml
2023-01-16 10:33:52 +08:00
tiger_zhou
10b1a9f125 权限代码调整 2023-01-13 18:17:23 +08:00
tiger_zhou
8d07023419 权限代码调整 2023-01-13 17:47:47 +08:00
tiger_zhou
3a859527d8 权限分发支持 组织,项目,用户创建仿真对组织,项目权限的验证 2023-01-13 17:32:49 +08:00
tiger_zhou
8c10192b57 三方登录调整 2023-01-13 10:36:16 +08:00
tiger_zhou
731bd470e3 支持三方账号权限验证 2023-01-12 18:33:17 +08:00
tiger_zhou
f4acd77850 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2023-01-12 18:32:49 +08:00
tiger_zhou
b76aaaac77 对项目权限不验证验证配置 2023-01-11 18:02:14 +08:00
weizhihong
e308fb1067 【调整实训设备数目】 2023-01-11 17:59:16 +08:00
tiger_zhou
d88ffb7437 添加 对jjjlm,teaching项目权限的过滤取消 2023-01-11 17:38:07 +08:00
46c5fa05f4 修改试卷数据处理接口 2023-01-11 17:14:31 +08:00
650625c19f Merge remote-tracking branch 'origin/test-training2' into test-training2 2023-01-11 16:17:46 +08:00
4dce82edb8 修改删减组织关联的项目时会删除所有关联关系的bug 2023-01-11 16:17:32 +08:00
tiger_zhou
31c46f8832 实训用户管理,数据管理可分页 2023-01-11 16:09:43 +08:00
weizhihong
2817af5adb 【修改实训生成设置】 2023-01-11 16:04:08 +08:00
tiger_zhou
a4eb84d63a 武汉8修改默认角色 2023-01-11 14:38:17 +08:00
8fb8671300 修改数据处理接口;修改大铁地图功能分组 2023-01-11 10:47:12 +08:00
90238254ee 修改地图功能默认描述 2023-01-10 18:16:39 +08:00
aa221c9ba2 Merge remote-tracking branch 'origin/test-training2' into test-training2 2023-01-10 17:44:12 +08:00
weizhihong
9cf4039365 【实训反序列化失败捕获】 2023-01-10 17:24:37 +08:00
tiger_zhou
7953f51000 修改权限数据同步结果返回的数据 2023-01-10 17:23:44 +08:00
tiger_zhou
47bb0696a5 权限同步时,清除所有数据 2023-01-10 16:51:28 +08:00
99b519bf61 修改创建地图功能接口以支持创建时分组 2023-01-10 16:42:57 +08:00
c79221112f 增加地图功能分组接口 2023-01-10 15:42:57 +08:00
weizhihong
050e653cd4 【指定地图ID、规则ID生成实训】 2023-01-10 14:10:07 +08:00
weizhihong
5900b906ca Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2 2023-01-10 11:13:08 +08:00
weizhihong
24a0a5f0d2 【根据修改的实训规则生成实训接口】 2023-01-10 11:13:03 +08:00
96a3b9f40e Merge remote-tracking branch 'origin/test-training2' into test-training2 2023-01-10 09:18:05 +08:00
cb02486a7b 修改一键数据处理接口 2023-01-10 09:17:53 +08:00