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

3077 Commits

Author SHA1 Message Date
xzb
0ac1c36177 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-12-07 18:10:24 +08:00
xzb
b448ada917 iscs v2 2022-12-07 18:10:06 +08:00
weizhihong
1286130d5a 【增加站台定位】 2022-12-07 18:06:53 +08:00
weizhihong
3c2361af4e 【实训生成定位修改】 2022-12-07 17:26:43 +08:00
xzb
6b26675fdd Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-12-07 17:04:24 +08:00
xzb
40f0837af0 iscs v2 2022-12-07 17:04:06 +08:00
tiger_zhou
f82e500572 考试定义调整 2022-12-07 15:41:59 +08:00
tiger_zhou
539f5dedc4 权限分发调整 2022-12-07 14:00:39 +08:00
tiger_zhou
2d65861512 权限分发调整 2022-12-07 13:51:02 +08:00
tiger_zhou
c18565cf21 同步不调用 mapFunction 生成接口，调整数据添加速度 2022-12-07 10:31:21 +08:00
weizhihong
cd344bc3f0 【实训背景设置修改】 2022-12-07 10:12:02 +08:00
weizhihong
473446cef0 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2 2022-12-06 17:41:11 +08:00
weizhihong
359d2e0be0 【实训名称重名检验】 2022-12-06 17:41:04 +08:00
joylink_zhangsai
f16362af53 Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-12-06 17:34:29 +08:00
joylink_zhangsai
f85b964dfa 旧数据处理接口自带清表；DomConfig增加实训类型 2022-12-06 17:34:13 +08:00
tiger_zhou
54c4d8e7b3 发布的单操，场景实训 基本信息接口合并 2022-12-06 16:20:24 +08:00
weizhihong
4976c770d0 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2 2022-12-06 15:44:01 +08:00
weizhihong
9426b1165b 【筛选实训设备修改】 2022-12-06 15:43:47 +08:00
tiger_zhou
13a4163ce3 发布的单操，场景实训 基本信息接口合并 2022-12-06 15:38:16 +08:00
weizhihong
0ab197318f 【修改实训背景状态以及站台设备筛选】 2022-12-06 15:18:02 +08:00
weizhihong
902a39bd0b 【增加实训生成背景、设备选择】 2022-12-06 11:13:10 +08:00
xzb
4d8cc8e409 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-12-06 11:02:24 +08:00
xzb
0b72c2c16d iscs v2 2022-12-06 11:02:07 +08:00
joylink_zhangsai
38868f2ea7 Exam->PaperComposition;UserExam->PaperUser 2022-12-06 10:50:52 +08:00
joylink_zhangsai
50d028d92a Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-12-06 10:18:49 +08:00
tiger_zhou
6d42373ba0 rts_paper_user 表删除 org_id 2022-12-06 09:49:35 +08:00
joylink_zhangsai
08e6344ae8 Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-12-06 09:48:31 +08:00
weizhihong
47987c9040 【地图设备筛选、背景设置修改】 2022-12-06 08:57:33 +08:00
xzb
3ff942aaa4 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-12-05 17:05:39 +08:00
xzb
232b44cf06 iscs v2 2022-12-05 17:05:17 +08:00
joylink_zhangsai
e3ff068d5c Org->RtsOrgProject 2022-12-05 16:50:27 +08:00
joylink_zhangsai
dace38e27c Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-12-05 15:50:36 +08:00
joylink_zhangsai
c059b43500 vrTrain背景保存bug修改；移除vrTrain里的Audio 2022-12-05 15:50:25 +08:00
weizhihong
219267c455 【生成实训规则修改】 2022-12-05 15:48:26 +08:00
joylink_zhangsai
9e7fe0c336 Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-12-05 15:08:15 +08:00
joylink_zhangsai
e5aa725dca 修改StorageVirtualRealityTrain；增加一个粗糙的Storage类生成工具 2022-12-05 15:07:56 +08:00
xzb
9f53eb27df iscs v2 2022-12-05 10:30:17 +08:00
weizhihong
1428cf38f5 【增加实训背景种类】 2022-12-02 18:14:50 +08:00
weizhihong
cb12f654a2 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2 2022-12-02 16:01:55 +08:00
weizhihong
f0b3496ac2 【实训背景保存最终会话信息】 2022-12-02 16:01:46 +08:00
joylink_zhangsai
ddaf91647a 修改地铁仿真初始化逻辑 2022-12-02 11:26:52 +08:00
joylink_zhangsai
d285b24d66 Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-12-02 10:47:15 +08:00
joylink_zhangsai
cd2ddbd106 迁移/common接口；仿真客户端使用前端定义的值 2022-12-02 10:46:59 +08:00
weizhihong
c3220b894e 【实训语音识别返回匹配结果消息】 2022-12-02 09:07:20 +08:00
weizhihong
c59517194d 【实训文字输入全文匹配校验】 2022-12-01 17:53:16 +08:00
weizhihong
10374c8bbb 【去掉实训中检验前端完成状态的判断】 2022-12-01 17:33:32 +08:00
joylink_zhangsai
ce4744f519 Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-12-01 16:42:48 +08:00
joylink_zhangsai
15fa4924a2 修改仿真id生成规则（mapId-userId）；为了加快项目重启后进入仿真的速度，重启后缓存所有在线地图数据 2022-12-01 16:42:37 +08:00
tiger_zhou
89a1884588 权限同步调整，及应急系统日志调整 2022-12-01 14:48:42 +08:00
tiger_zhou
181ced36b4 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-12-01 14:48:13 +08:00
tiger_zhou
c3bd3a330b 权限同步调整，及应急系统日志调整 2022-12-01 14:47:57 +08:00
weizhihong
675b3c5107 【修改实训设备筛选逻辑】 2022-12-01 14:38:11 +08:00
joylink_zhangsai
adbfedbff0 Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-12-01 14:19:56 +08:00
joylink_zhangsai
f0d68d2f31 增加退出仿真接口；删除仿真邀请消息 2022-12-01 14:19:46 +08:00
tiger_zhou
a299c3471f 权限同步调整，及应急系统日志调整 2022-12-01 14:07:46 +08:00
weizhihong
37d9a6d8c8 【修改实训区段筛选条件】 2022-12-01 13:19:00 +08:00
joylink_zhangsai
977029410d Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-12-01 13:08:53 +08:00
joylink_zhangsai
a5f22ad154 仿真用户数据里增加creator字段 2022-12-01 13:08:38 +08:00
weizhihong
54599af87a Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2 2022-12-01 10:58:05 +08:00
weizhihong
bc02cc9595 【增加区故解、分路不良实训生成】 2022-12-01 10:57:47 +08:00
joylink_zhangsai
993c081dbd MapSystem->RtsMapFunction修改 2022-12-01 10:57:45 +08:00
joylink_zhangsai
13a7f01a77 Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-12-01 10:57:10 +08:00
joylink_zhangsai
f719603446 将实迹运行图消息订阅路径独立出来；仿真用户增加类型 2022-12-01 10:56:47 +08:00
weizhihong
e83a3d2525 【修改属性与实训属性一致】 2022-12-01 09:51:23 +08:00
weizhihong
4fec906849 【道岔定反位背景】 2022-11-30 16:22:20 +08:00
weizhihong
1753c0dd12 【实训规则地图ID修改为仿真类型】 2022-11-30 16:06:21 +08:00
joylink_zhangsai
45882142b3 增加MapSystem->RtsMapFunction数据转化接口 2022-11-30 15:43:01 +08:00
weizhihong
27a4dbd5b2 【进路列表筛选】 2022-11-30 14:48:24 +08:00
joylink_zhangsai
9871e37f81 Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-11-30 14:01:29 +08:00
joylink_zhangsai
59cb703042 将“管理员”销毁仿真的接口从之前的清理仿真接口里独立出来，清理仿真接口仅用于仿真创建者退出时销毁仿真用 2022-11-30 14:01:21 +08:00
weizhihong
e2ff7e2b5d 【重算实训地图定位】 2022-11-30 13:35:03 +08:00
weizhihong
59ddb040ff 【根据实训规则生成实训，实训场景连续两步为机器人不执行BUG】 2022-11-30 13:18:39 +08:00
weizhihong
cf44dc3ad2 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2 2022-11-30 10:35:51 +08:00
weizhihong
066c4133fc 【会话判断修改】 2022-11-30 10:35:45 +08:00
joylink_zhangsai
3974e96c99 Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-11-30 10:25:43 +08:00
joylink_zhangsai
bc160fdf35 暂时取消加入仿真的综合演练仿真检查 2022-11-30 10:25:17 +08:00
weizhihong
2da9680c6f 【修改创建会话逻辑】 2022-11-29 16:59:13 +08:00
joylink_zhangsai
078a49471e 加载背景时，仿真的运行图已加载才发布运行图重载事件 2022-11-29 14:11:38 +08:00
joylink_zhangsai
2e6c06c0cc 修改按计划行车请求方法(上次改错了） 2022-11-29 13:56:13 +08:00
joylink_zhangsai
6338ccce21 修改按计划行车请求方法 2022-11-29 13:52:04 +08:00
joylink_zhangsai
c176030f8e Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-11-29 10:35:36 +08:00
joylink_zhangsai
8e1bf07869 修改Dom配置；修改地图功能生成的Dom配置 2022-11-29 10:35:18 +08:00
weizhihong
0d2ad18c2a 【学员机登录逻辑修改】 2022-11-28 18:27:56 +08:00
weizhihong
c2c663f483 【通过ID获取系统功能信息】 2022-11-28 16:16:42 +08:00
joylink_zhangsai
f77404029b Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-11-28 14:56:36 +08:00
joylink_zhangsai
44a77be43a 大铁仿真创建后自动按计划行车；增加大铁按计划行车逻辑 2022-11-28 14:56:25 +08:00
tiger_zhou
e628916d52 应急系统测试调整 2022-11-28 14:55:02 +08:00
tiger_zhou
a2ee2e1858 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-11-28 14:10:36 +08:00
tiger_zhou
6bbda91f08 应急系统测试调整 2022-11-28 14:10:15 +08:00
joylink_zhangsai
1a9c156379 增加两个Dom配置 2022-11-28 11:28:42 +08:00
weizhihong
6552caaec2 【查询有效的组织信息】 2022-11-28 11:00:47 +08:00
weizhihong
753ad674f4 【取消用户列表条数限制】 2022-11-28 10:46:33 +08:00
weizhihong
9ac0ad8f44 【实训查询所有信息列表】 2022-11-28 10:23:14 +08:00
tiger_zhou
2598afe378 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-11-28 10:16:47 +08:00
tiger_zhou
7c0ab9af83 考试管理接口 2022-11-28 10:16:32 +08:00
weizhihong
d1255c931d 【修改项目信息查询】 2022-11-28 10:04:53 +08:00
weizhihong
6a1b8b73f3 【根据项目Code获取项目信息】 2022-11-28 09:49:38 +08:00
weizhihong
9ccbce9bea 【绑定组织bug】 2022-11-28 09:00:07 +08:00
weizhihong
2c360a2c00 【项目设置增加地图ID、功能ID】 2022-11-24 17:23:53 +08:00
weizhihong
8c86917bf2 【查询用户列表数目限制、实训运行状态标识】 2022-11-24 15:13:02 +08:00
weizhihong
bc5c79bcb4 【账号存储电话属性】 2022-11-24 13:35:22 +08:00
weizhihong
bd69d749b4 【实训详情缺少client问题】 2022-11-23 17:15:12 +08:00
weizhihong
31688227ed 【创建仿真时，保存功能ID】 
【根据地图ID与功能ID获取仿真】
【组织用户管理接口】
【实训增加client字段】
 2022-11-23 16:50:31 +08:00
weizhihong
47f9385fa7 【重置方法修改DELETE方式】 2022-11-22 15:59:23 +08:00
weizhihong
3f1a6fb508 【修改websocket传输数据大小限制，修改为1M】 2022-11-22 15:21:49 +08:00
tiger_zhou
730bf6670d 权限显示全部数据 2022-11-22 11:10:21 +08:00
weizhihong
e04600a2d6 【实训暂停死循环处理】 2022-11-21 09:03:37 +08:00
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
joylink_zhangsai
e379a0a95f 增加订阅设备状态时发送所有设备状态逻辑 2022-11-08 10:16:52 +08:00
joylink_zhangsai
b4f7b305b6 新版仿真恢复大客流任务加载逻辑 2022-11-07 18:01:04 +08:00
tiger_zhou
380bc6df65 用户权限同步调整，北交大登录按照通用方式 2022-11-07 17:11:50 +08:00
joylink_zhangsai
f132220891 Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-11-07 17:08:59 +08:00
joylink_zhangsai
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
joylink_zhangsai
6eecb0e6bc Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-11-03 17:38:46 +08:00
joylink_zhangsai
4cff884c4b 增加生成大客流线路功能接口 2022-11-03 17:38:33 +08:00
tiger_zhou
741494e965 用户权限同步调整 2022-11-03 16:46:59 +08:00
joylink_zhangsai
f56eb47d53 Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-11-03 16:17:17 +08:00
joylink_zhangsai
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
joylink_zhangsai
c0c2e81ebf 增加仿真工作参数变更后发送ws消息逻辑； 2022-11-03 15:37:17 +08:00
weizhihong
19775a11ce 【删除多余jar】 2022-11-02 17:03:06 +08:00
joylink_zhangsai
001e343459 大铁生成子系统增加综合演练和实训设计 2022-11-02 15:58:35 +08:00
joylink_zhangsai
28ff6dd8d9 Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-11-02 13:44:59 +08:00
joylink_zhangsai
329a36ef48 增加通过地图功能id创建仿真的接口 2022-11-02 13:44:43 +08:00
tiger_zhou
539c41ba85 客户端权限列表 2022-11-01 10:42:38 +08:00
joylink_zhangsai
5a197b5e90 修改仿真不加载运行图bug 2022-10-31 15:54:42 +08:00
joylink_zhangsai
ddfa763746 地图子系统改线路功能 2022-10-31 14:31:56 +08:00
joylink_zhangsai
784918e8f1 消除报错 2022-10-31 13:58:22 +08:00
joylink_zhangsai
617e72bfb0 消除报错 2022-10-31 13:50:37 +08:00
joylink_zhangsai
a0c8c424be Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-10-31 13:41:39 +08:00
joylink_zhangsai
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
tiger_zhou
d16e4275c0 试卷生成代码调整 2022-10-28 13:31:53 +08:00
tiger_zhou
69f81d56a9 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-10-28 13:25:58 +08:00
tiger_zhou
f3960db9b0 试卷生成代码调整 2022-10-28 13:25:38 +08:00
weizhihong
ac6e8b212e 【实训生成成员规则】 2022-10-28 13:17:24 +08:00
weizhihong
9938671184 【调整实训参数类型】 2022-10-28 13:05:20 +08:00
tiger_zhou
0589157cc7 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-10-28 11:24:22 +08:00
tiger_zhou
2ef33927ea 试卷生成代码调整 2022-10-28 11:24:09 +08:00
weizhihong
bb9d407a8e 【增加实训角色获取规则】 2022-10-28 11:16:19 +08:00
tiger_zhou
6561c722c0 题库导入 标签分类为空字符串问题 2022-10-28 10:48:58 +08:00
tiger_zhou
5e2889e2ce 题库导入 标签分类为空字符串问题 2022-10-28 10:48:23 +08:00
tiger_zhou
0a1381b63d Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-10-28 10:38:24 +08:00
tiger_zhou
1b71490dd1 试卷规则修改 2022-10-28 10:38:11 +08:00
weizhihong
c97528bcec 【实训属性名称修改】 2022-10-28 09:44:30 +08:00
tiger_zhou
9733dac257 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-10-28 09:09:40 +08:00
tiger_zhou
d4c7cbf1e8 权限分发代码调整 2022-10-28 09:09:20 +08:00
joylink_zhangsai
60d126cb28 修改注释 2022-10-27 18:10:40 +08:00
joylink_zhangsai
999f6dd971 增加实训反射调用方法 2022-10-27 18:09:31 +08:00
weizhihong
2302913a7a 【实训规则增加子系统、客户端】 2022-10-27 17:32:38 +08:00
tiger_zhou
bf9199ef37 题库更改错误文字 2022-10-27 17:28:32 +08:00
weizhihong
7b208af820 【修改实训，增加子系统、客户端字段】 2022-10-27 17:12:14 +08:00
joylink_zhangsai
27e9d0b48e 增加项目JJJLM 2022-10-27 16:08:44 +08:00
tiger_zhou
00b504f7b3 试卷规则分类只支持一个 2022-10-27 15:37:49 +08:00
tiger_zhou
987dbbe43c Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-10-27 14:42:58 +08:00
tiger_zhou
6eca4a5b5b 题库标签最多只支持一个，试卷重复问题 2022-10-27 14:42:40 +08:00
weizhihong
cb66ac91c0 【实训规则修改】 2022-10-26 16:06:22 +08:00
tiger_zhou
e8d0207e49 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-10-26 15:55:09 +08:00
tiger_zhou
ebf3377cc1 用户权限修改status数据类型，用户权限查询过滤，试卷标签筛选从 or 变更为 and 2022-10-26 15:54:56 +08:00
weizhihong
f847b306f4 【步骤增加仿真操作属性】 
【修改实训运行逻辑】
 2022-10-26 14:18:24 +08:00
tiger_zhou
d05ce9ccef 权限分发，查询调整 2022-10-26 14:07:59 +08:00
tiger_zhou
4a8f71ad1e 新（支持前端多个权限）权限分发,目前接口不支持二次分发 2022-10-26 10:49:00 +08:00
joylink_zhangsai
4252c56961 Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-10-26 09:34:00 +08:00
joylink_zhangsai
6e6e3f7114 增加第三方账户配置接口；修改地图数据导入bug 2022-10-26 09:33:47 +08:00
weizhihong
746cea77b4 【生成实训规则实体】 2022-10-25 15:17:52 +08:00
weizhihong
7442082a7a 【空指针BUG】 2022-10-25 14:01:25 +08:00
weizhihong
6a7d89bfe5 【修改表名】 2022-10-25 13:31:42 +08:00
xiazengbin
ec09da1efc permission 2022-10-25 13:12:15 +08:00
xiazengbin
150e4dc1b5 permission 2022-10-25 12:37:30 +08:00
joylink_zhangsai
9114da604b 仿真信息接口增加仿真工作参数；地图复制接口修改 2022-10-25 10:46:13 +08:00
joylink_zhangsai
0f506ce2ad Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-10-25 09:19:35 +08:00
joylink_zhangsai
6627018a02 注释掉大客流的监听器（行调工作站按计划行车报错） 2022-10-25 09:19:16 +08:00
tiger_zhou
a3d0545da1 试卷筛选出现没有选择类型的题目 2022-10-24 17:57:56 +08:00
joylink_zhangsai
1e3475bb62 修改导入/导出接口 2022-10-24 17:02:32 +08:00
tiger_zhou
6fcbf24d13 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-10-24 16:45:02 +08:00