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

3045 Commits

Author SHA1 Message Date
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
tiger_zhou
c8a77c9034 权限功能提供列表接口 2022-10-24 16:44:48 +08:00
weizhihong
c2c31ce3b3 【地图数据所属项目为空时，处理默认项目】 2022-10-24 15:36:10 +08:00
weizhihong
b0330e85cf 【登录时，处理用户项目列表】 2022-10-24 14:45:56 +08:00
tiger_zhou
616d8898b4 权限功能注释不必要的接口 2022-10-24 13:52:41 +08:00
tiger_zhou
7880ced128 答题试卷可以重复答题，并且修改的时候返回上次答题的答案 2022-10-24 10:12:46 +08:00
tiger_zhou
231171b6c8 用户权限支持查看已很配领取的权限，答题试卷在创建的时候及有开始时间 2022-10-21 17:14:56 +08:00
tiger_zhou
e398d0c364 用户权限禁用接口调整 2022-10-21 14:31:53 +08:00
tiger_zhou
16276f80f7 用户权限禁用接口调整 2022-10-21 14:30:52 +08:00
tiger_zhou
78e91eb573 权限查询支持昵称及功能列表，用户权限禁用接口调整 2022-10-21 14:30:20 +08:00
tiger_zhou
f0a420311c Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-10-21 11:03:09 +08:00
tiger_zhou
688654d7d4 语音识别调整 2022-10-21 11:02:55 +08:00
weizhihong
d94039c8bb 【MINIO删除对象方法】 2022-10-21 09:43:15 +08:00
tiger_zhou
6b6fd85cc6 权限功能调整 2022-10-20 18:03:12 +08:00
tiger_zhou
e52ffe07a8 权限功能调整 2022-10-20 18:01:02 +08:00
tiger_zhou
4f0a10bb6d Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-10-20 17:27:10 +08:00
tiger_zhou
17fb69073e 权限功能调整 2022-10-20 17:26:54 +08:00
tiger_zhou
b5c186aa13 权限功能调整 2022-10-20 15:23:20 +08:00
joylink_zhangsai
47ec3e5ecc Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-10-20 15:12:16 +08:00
joylink_zhangsai
1ae745b377 增加新的根据用户信息查询地图接口 2022-10-20 15:12:00 +08:00
tiger_zhou
b838e4dd3c 应急预警调整 2022-10-20 14:50:45 +08:00
tiger_zhou
1101841879 权限功能调整 2022-10-20 14:25:52 +08:00
tiger_zhou
8d74d09d80 权限功能调整 2022-10-20 13:52:00 +08:00
tiger_zhou
d142179cb7 权限功能调整 2022-10-20 13:45:09 +08:00
tiger_zhou
81c4db28a7 权限功能调整 2022-10-20 13:39:05 +08:00
tiger_zhou
ad319c094e 权限功能调整 2022-10-20 13:37:12 +08:00
tiger_zhou
0b04b23537 权限功能调整及权限主体禁用功能(未完成) 2022-10-20 13:33:58 +08:00
tiger_zhou
f9b02894e0 Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-10-20 09:54:07 +08:00
tiger_zhou
484ff18eed 理论试题管理代码调整支持清空 2022-10-20 09:52:36 +08:00
tiger_zhou
1f63bd48e2 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-10-20 09:27:18 +08:00
xzb
a20a57b5c0 修改试卷定义时间判断 2022-10-20 09:24:31 +08:00
xzb
d29a869c26 permission 2022-10-19 17:47:42 +08:00
xzb
4b43640085 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-10-19 17:07:34 +08:00
xzb
677f9ab163 permission 2022-10-19 17:07:16 +08:00
weizhihong
5ad0bec6ba Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2 2022-10-19 16:49:36 +08:00
weizhihong
73f73a426e 【删除登录信息中所有的组织信息】 2022-10-19 16:49:29 +08:00
xzb
315e956927 permission 2022-10-19 16:46:36 +08:00
tiger_zhou
d37b10f207 应急系统添加速度及调整 2022-10-19 16:06:13 +08:00
tiger_zhou
e14286f329 应急系统添加速度及调整 2022-10-19 15:59:51 +08:00
xzb
074f49a2a9 permission 2022-10-19 15:59:19 +08:00
xzb
3c4a678db0 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-10-19 15:59:00 +08:00
xzb
9c12891135 permission 2022-10-19 15:58:36 +08:00
tiger_zhou
4201b1165d 应急系统添加速度及调整 2022-10-19 15:53:41 +08:00
tiger_zhou
1b7e46d5c7 权限主体 2022-10-19 15:49:36 +08:00
joylink_zhangsai
e9e45d5cb6 Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-10-19 15:41:03 +08:00
joylink_zhangsai
72b4ac8fd5 修改生成子系统逻辑 2022-10-19 15:40:39 +08:00
xzb
6135e912f2 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-10-19 15:02:50 +08:00
xzb
9a0d0d2980 permission 2022-10-19 15:02:33 +08:00
tiger_zhou
66ac5d7b02 Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-10-19 14:00:51 +08:00
tiger_zhou
1680097d72 新权限分发及题库代码调整 2022-10-19 14:00:07 +08:00
xzb
ebe85d7c26 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-10-19 13:55:30 +08:00
xzb
7de63057a3 permission 2022-10-19 13:55:13 +08:00
tiger_zhou
d454a2a51c 新权限分发代码调整 2022-10-19 13:39:25 +08:00
tiger_zhou
4c1ce8e593 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/entity/permission/PermissionDistribute.java
	src/main/java/club/joylink/rtss/entity/permission/PermissionDistributeExample.java
	src/main/resources/mybatis/mapper/permission/PermissionSubjectDAO.xml
 2022-10-19 13:35:37 +08:00
joylink_zhangsai
ef389ca8f4 导入导出增加运行图交路数据 2022-10-19 13:34:23 +08:00
tiger_zhou
c2dbbbb715 应急系统添加速度及调整 2022-10-19 13:25:25 +08:00
joylink_zhangsai
5a3179df5a 修改新仿真创建接口参数；修改生成子系统接口（未完） 2022-10-19 11:16:22 +08:00
xzb
b7a25fb070 permission 2022-10-19 11:09:44 +08:00
xzb
3eae7d7672 permission 2022-10-19 10:06:03 +08:00
xzb
ec4509d7ef permission 2022-10-19 10:04:21 +08:00
xzb
6c36d6f753 permission 2022-10-19 09:54:56 +08:00
xzb
54c73004d9 permission 2022-10-19 09:49:38 +08:00
weizhihong
d0d517450f Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2 2022-10-19 08:53:09 +08:00
weizhihong
afc62e8f4e 【修改顶级组织ID获取逻辑】 2022-10-19 08:53:03 +08:00
xzb
f81041afa1 permission 2022-10-18 17:45:34 +08:00
xzb
0d758f8ca5 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-10-18 17:41:20 +08:00
xzb
14ad0dfce5 permission 2022-10-18 17:40:56 +08:00
weizhihong
853dd2fe35 【修改查询班级时，获取组织逻辑】 2022-10-18 15:27:26 +08:00
joylink_zhangsai
a652d06bb6 Merge remote-tracking branch 'origin/test-training2' into test-training2 
# Conflicts:
#	src/main/java/club/joylink/rtss/services/draftData/DraftMapDisStationService.java
 2022-10-18 14:21:23 +08:00
joylink_zhangsai
3a5fbb16e9 增加生成子系统的接口；增加仿真客户端类型； 2022-10-18 14:19:40 +08:00
xzb
df6e9fd578 permission 2022-10-18 13:50:29 +08:00
xzb
0a752feb47 permission 2022-10-18 13:19:15 +08:00
xzb
24dd1cead9 permission 2022-10-18 13:08:19 +08:00
xzb
b40ccfe775 permission 2022-10-18 10:29:05 +08:00
xzb
013b58f6bd page 2022-10-18 09:52:42 +08:00
xzb
fe9333fbb5 permission 2022-10-18 09:43:55 +08:00
xzb
a912a25c51 permission 2022-10-18 09:38:54 +08:00
tiger_zhou
c8a8bdc6ee 新权限分发领取功能 2022-10-18 09:27:16 +08:00
xzb
0e34851966 paper 2022-10-17 17:07:42 +08:00
xzb
5310fc7819 paper 2022-10-17 16:28:46 +08:00
xzb
522d446516 paper 2022-10-17 16:13:16 +08:00
xzb
44e1c38a74 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-10-17 16:04:33 +08:00
xzb
d869ce06da paper 2022-10-17 16:04:16 +08:00
joylink_zhangsai
761d7e353b Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-10-17 14:52:45 +08:00
joylink_zhangsai
5c06c0105b 增加查询地图车站列表接口；修改仿真成员设备查找逻辑bug； 2022-10-17 14:52:34 +08:00
xzb
158d436a61 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-10-17 14:45:17 +08:00
xzb
4f1029f5b6 paper 2022-10-17 14:45:01 +08:00
xzb
3b944a63db paper 2022-10-17 14:43:28 +08:00
weizhihong
7547b6b14b 【选择组织修改登录信息】 2022-10-17 14:23:57 +08:00
tiger_zhou
bc0969e6e5 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-10-17 14:19:31 +08:00
tiger_zhou
c68978cd1b 理论试题管理代码调整 2022-10-17 14:19:13 +08:00
xzb
47388d250e Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-10-17 14:18:26 +08:00
xzb
c9e16545d4 paper 2022-10-17 14:17:27 +08:00
tiger_zhou
1910f7a1c7 理论试题管理代码调整 2022-10-17 14:02:05 +08:00
tiger_zhou
6f404ceb88 理论试题管理代码调整 2022-10-17 13:20:45 +08:00
tiger_zhou
5f08745963 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-10-17 08:54:41 +08:00
xzb
b3ecb6c1d2 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-10-14 17:51:41 +08:00
xzb
7a0b9eb2de paper 2022-10-14 17:51:05 +08:00
tiger_zhou
b8cf53b572 理论试题管理代码调整 2022-10-14 17:05:50 +08:00
tiger_zhou
b3e770f6fa Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-10-14 16:45:05 +08:00
tiger_zhou
0c0cf91f2b 理论试题管理代码调整，查询标签支持单一的类型 2022-10-14 16:44:48 +08:00
xzb
3cbe689658 paper 2022-10-14 16:44:24 +08:00
xzb
500eb26183 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-10-14 16:34:02 +08:00
xzb
7159663aec permission 2022-10-14 16:33:30 +08:00
tiger_zhou
016f6c8c48 理论试题管理代码调整 2022-10-14 16:26:19 +08:00
tiger_zhou
6f42bfbe9c 理论试题管理代码调整 2022-10-14 16:10:24 +08:00
tiger_zhou
f2293c35f2 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-10-14 16:08:22 +08:00
tiger_zhou
8d1c1c6c09 理论试题管理代码调整及添加数量获取方法 2022-10-14 16:08:00 +08:00
joylink_zhangsai
9e0026e622 Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-10-14 14:59:21 +08:00
joylink_zhangsai
f847b2e4d6 Merge remote-tracking branch 'origin/test-training2' into test-training2 
# Conflicts:
#	src/main/java/club/joylink/rtss/simulation/cbtc/Simulation.java
 2022-10-14 14:58:30 +08:00
tiger_zhou
d099cbccf1 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-10-14 14:58:21 +08:00
joylink_zhangsai
b50d1ead24 新仿真结构完善中 2022-10-14 14:57:30 +08:00
tiger_zhou
c2dcc93b91 权限功能管理相关管理代码调整 2022-10-14 14:57:22 +08:00
weizhihong
6f17d72983 【查询教师列表、增加教师信息】 2022-10-14 14:55:52 +08:00
xzb
d9828671c7 permission 2022-10-14 14:25:02 +08:00
xzb
e577e255a9 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-10-14 13:33:42 +08:00
xzb
ab117af819 paper permission 2022-10-14 13:33:09 +08:00
tiger_zhou
5a60700246 功能权限在删除的时候检测rts_permission_system_ability 表中是否有对应的数据如果没有就删除数据 2022-10-14 13:26:43 +08:00
tiger_zhou
b3d131ff56 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-10-14 13:25:24 +08:00
tiger_zhou
685b3ec4fa 理论试题管理代码调整，支持查询分页标签检索 2022-10-14 13:25:07 +08:00
tiger_zhou
f3925f8cdb 理论试题管理代码调整，支持查询分页标签检索 2022-10-14 13:24:52 +08:00
xzb
b8d1d81ac9 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-10-14 11:03:41 +08:00
xzb
2153363e48 paper permission 2022-10-14 11:03:21 +08:00
tiger_zhou
6da5f3a5ac Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-10-14 10:25:56 +08:00
tiger_zhou
80307e835d 理论试题管理代码调整，支持乱序预览及测试答题 2022-10-14 10:25:40 +08:00
xzb
27f95fdc96 permission 2022-10-14 09:34:35 +08:00
xzb
6fa2a1b105 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-10-13 17:49:13 +08:00
xzb
de0bb265d8 permission 2022-10-13 17:48:52 +08:00
tiger_zhou
676ee99043 功能管理相关管理代码调整 2022-10-13 17:38:19 +08:00
tiger_zhou
603cd9d0e8 功能管理相关管理 2022-10-13 17:37:16 +08:00
weizhihong
76066aa2dd 【编码修改为模糊查询】 2022-10-13 17:22:13 +08:00
weizhihong
54241ee9a1 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2 2022-10-13 16:46:09 +08:00
weizhihong
78fadf8721 【默认组织逻辑】 2022-10-13 16:45:59 +08:00
xzb
e54db545cf Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-10-13 16:38:09 +08:00
xzb
5b61c9bef6 permission 2022-10-13 16:37:46 +08:00
tiger_zhou
123dc43dc3 理论试题管理代码调整 2022-10-13 15:33:37 +08:00
xzb
2955125f76 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-10-13 15:07:21 +08:00
xzb
106c16aedb permission 2022-10-13 15:07:03 +08:00
tiger_zhou
e82b8dc3d2 Merge remote-tracking branch 'origin/test-training2-zhouyin' into test-training2 2022-10-13 15:01:17 +08:00
tiger_zhou
70a2ff5fa8 理论试题管理代码调整 2022-10-13 15:00:52 +08:00
xzb
87d3fa57cb permission 2022-10-13 14:58:41 +08:00
xzb
8d3dc02b82 permission 2022-10-13 14:48:21 +08:00
xzb
7c5551f891 permission 2022-10-13 14:44:25 +08:00
xzb
92c25f77fd Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-10-13 14:22:39 +08:00
xzb
4977bc2e1d permission 2022-10-13 14:22:23 +08:00
tiger_zhou
7b491cf237 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-10-13 13:23:41 +08:00
tiger_zhou
5ebf8c63f5 理论试题管理代码调整 2022-10-13 13:23:29 +08:00
xzb
1611282abb paper 2022-10-13 11:26:32 +08:00
tiger_zhou
31dc5c283a 理论试题管理代码调整，合并管理接口 2022-10-13 11:15:46 +08:00
xzb
b94f1c5a03 new permission 2022-10-13 11:15:04 +08:00
xzb
dde2fb93c1 new permission 2022-10-13 10:05:36 +08:00
xzb
0eb6059f79 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-10-13 09:32:46 +08:00
xzb
3127ceaea1 new permission 2022-10-13 09:32:24 +08:00
weizhihong
c7c46228bc Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2 2022-10-12 18:08:13 +08:00
weizhihong
1089d2d410 【项目信息编辑】 2022-10-12 18:08:07 +08:00
xzb
d64117292a paper 2022-10-12 17:44:11 +08:00
xzb
fabaff59fb Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-10-12 17:27:02 +08:00
weizhihong
9d070b43d5 【登录角色列表设置】 2022-10-12 17:21:06 +08:00
weizhihong
02e8ce4d9e 【解决登录时获取项目列表BUG】 2022-10-12 17:18:25 +08:00
weizhihong
d3ad9c958f 【登录选择组织列表逻辑，文件名称模糊搜索】 2022-10-12 17:06:57 +08:00
tiger_zhou
ab9275384b Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-10-12 16:54:25 +08:00
tiger_zhou
3de220bc62 理论试题管理修改表明添加“rts_”前缀 2022-10-12 16:52:53 +08:00
weizhihong
8c9c9eb0c0 【项目快捷创建组织接口】 2022-10-12 15:49:26 +08:00
weizhihong
1973bf3f24 【查询项目关联组织时，过滤多余字段】 2022-10-12 14:24:02 +08:00
weizhihong
ee8ad73e87 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2 2022-10-12 14:12:07 +08:00
weizhihong
2745d4950b 【项目增加默认组织字段，去除前端选择项目字段】 2022-10-12 14:11:58 +08:00
tiger_zhou
5376d3deb5 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-10-12 14:10:26 +08:00
tiger_zhou
e84b9ad0dc 应急预警系统-语音指令功能 2022-10-12 14:08:53 +08:00
xzb
89830befb4 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-10-12 10:41:21 +08:00
xzb
25fcd4e000 paper 2022-10-12 10:41:01 +08:00
joylink_zhangsai
820ea94b26 Merge remote-tracking branch 'origin/test-training2' into test-training2 
# Conflicts:
#	src/main/resources/application.yml
 2022-10-11 13:08:26 +08:00
joylink_zhangsai
a7b09745c3 新仿真结构完善中 2022-10-11 13:06:51 +08:00
tiger_zhou
8693449f85 理论试题管理代码调整 2022-10-11 10:03:39 +08:00
weizhihong
dfdf038d7e 【MINIO资源是否存在接口】 2022-10-11 09:53:30 +08:00
tiger_zhou
2112334492 理论试题管理代码调整 2022-10-11 09:19:38 +08:00
tiger_zhou
1e379c7e93 监管仿真接口 2022-10-11 09:18:14 +08:00
tiger_zhou
3bf5996bee Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-10-11 08:48:05 +08:00
weizhihong
53e90f652c 【MINIO连接程序替换http->https】 2022-10-10 17:04:01 +08:00
tiger_zhou
9e8ad48284 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-10-10 15:39:03 +08:00
joylink_zhangsai
3264befe0a Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-10-10 13:22:31 +08:00
joylink_zhangsai
821c31c446 仿真结构调整 2022-10-10 13:22:18 +08:00
weizhihong
13d2ac11dc 【minio链接修改为https】 2022-10-10 10:56:08 +08:00
xzb
122badc463 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-10-10 10:26:43 +08:00
xzb
575c58c739 paper 2022-10-10 10:26:13 +08:00
tiger_zhou
543584828e mybatis 查询数据封装对象支持"驼峰"规范 2022-10-10 09:28:09 +08:00
tiger_zhou
5bb5c07031 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-10-10 08:52:08 +08:00
weizhihong
271e44e9b2 【本地配置修改为http】 2022-10-09 18:30:32 +08:00
weizhihong
4509440175 【配置文件提交】 2022-10-09 18:21:01 +08:00
xzb
ceadaccb3b Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-10-09 18:03:48 +08:00
xzb
be1dc7de2e paper 2022-10-09 18:03:24 +08:00
tiger_zhou
1e18878c67 已发布实训添加查询维度(名称，地图，类型，标签及组织) 2022-10-09 16:09:12 +08:00
joylink_zhangsai
0b266b2284 修改信号机开放主信号判断逻辑以兼容国赛场景 2022-10-09 15:45:02 +08:00
weizhihong
16b035d43b 【设备管理中项目Code修改为前端指定】 2022-10-09 15:14:12 +08:00
joylink_zhangsai
7112697216 修改剧本运行bug 2022-10-09 15:09:17 +08:00
tiger_zhou
75c0965797 理论试题管理代码调整 2022-10-09 13:51:28 +08:00
xzb
23b169bb3b Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-10-09 13:34:55 +08:00
xzb
7c9e57cd16 paper 2022-10-09 13:34:28 +08:00
weizhihong
1cdef28ea3 【MINIO获取下载地址】 2022-10-09 13:27:11 +08:00
xzb
df77cfcc24 paper 2022-10-09 13:24:24 +08:00
xzb
12f91ba58c paper 2022-10-09 13:21:38 +08:00
xzb
7da9d7cd36 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-10-09 13:12:45 +08:00
xzb
41ae0d9c14 paper 2022-10-09 13:12:24 +08:00
joylink_zhangsai
11d4f7b154 修改Pis循环逻辑bug 2022-10-09 13:06:20 +08:00
tiger_zhou
7a385e3b9f 理论试题管理代码调整 2022-10-09 13:04:49 +08:00
xzb
04f217b7bf Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-10-09 11:28:46 +08:00
xzb
d442e8cc3f paper 2022-10-09 11:28:22 +08:00
tiger_zhou
4a450b40e7 理论试题管理代码调整 2022-10-09 11:25:51 +08:00
tiger_zhou
153fed2ef2 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-10-09 11:23:41 +08:00
xzb
53ba942a1f paper 2022-10-09 11:08:46 +08:00
xzb
be881f5694 paper 2022-10-09 10:57:30 +08:00
tiger_zhou
d648a44369 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-10-09 08:43:56 +08:00
joylink_zhangsai
3bf3ddab97 修改大铁实训生成bug； 2022-10-08 18:34:04 +08:00
joylink_zhangsai
703dd34635 修改大铁实训生成bug；生成课程考试时，如果无实训，则不生成课程与考试 2022-10-08 17:33:35 +08:00
xzb
276801b849 paper 2022-10-08 14:48:36 +08:00
xzb
6c9c214570 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-10-08 14:03:45 +08:00
xzb
cb6bf51096 paper 2022-10-08 14:03:19 +08:00
weizhihong
bf7d53e563 【登录时默认客户端处理】 2022-10-08 13:05:51 +08:00
xzb
21b1c6da99 调度命令 2022-10-08 11:14:12 +08:00
xzb
c915b0605e Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-10-08 11:10:04 +08:00
xzb
a148888e8e 调度命令、试卷 2022-10-08 11:09:39 +08:00
weizhihong
eb06ff4bac 【组织绑定项目编辑问题】 2022-10-08 10:11:59 +08:00
weizhihong
ea47f926be 【获取项目结构列表；登录机构接口调整】 2022-09-30 18:29:33 +08:00
xzb
051eaf4776 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-09-30 17:39:54 +08:00
xzb
5795139ad9 调度命令、试卷 2022-09-30 17:39:32 +08:00
joylink_zhangsai
689a6f433a 修改实训生成bug；修正加载实训时的角色选择逻辑 2022-09-30 17:32:24 +08:00
tiger_zhou
111b1f0de5 语音识别，合成重构调整 2022-09-30 16:48:02 +08:00
joylink_zhangsai
15780897a6 针对大铁线路修改排列/取消进路实训的生成逻辑 2022-09-30 16:28:53 +08:00
weizhihong
005c0ff34b 【路径修改】 2022-09-30 16:06:21 +08:00
weizhihong
7defb78dfa 【minio预处理路径接口】 2022-09-30 15:33:55 +08:00
tiger_zhou
0e2d8d9028 语音识别，合成重构 调整 2022-09-30 15:26:48 +08:00
weizhihong
1dd77a87b9 【MINIO上传的文件信息保存】 2022-09-30 14:57:34 +08:00
weizhihong
aadd300cb8 【MINIO上传文件信息保存接口，登录选组织信息操作】 2022-09-30 14:26:18 +08:00
joylink_zhangsai
b83f3eaee2 语音文件增加保存到本地逻辑（线下部署使用） 2022-09-30 13:36:59 +08:00
xzb
f97b92e6f8 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-09-30 13:15:29 +08:00
xzb
ee3e67046f 调度命令 2022-09-30 13:15:02 +08:00
weizhihong
92adde9c93 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2 2022-09-30 09:32:11 +08:00
weizhihong
84b542daa0 【增加非空判断，增加组织名称】 2022-09-30 09:32:05 +08:00
tiger_zhou
1db89def39 语音识别，合成重构 调整 2022-09-30 09:24:41 +08:00
weizhihong
e590b1b06d Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2 2022-09-29 18:12:33 +08:00
weizhihong
01aad063c9 【组织、项目关联关系；登录获取项目的组织信息；选择登录组织】 2022-09-29 18:12:27 +08:00
xzb
080c29da23 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-09-29 17:58:10 +08:00
xzb
95b0ba6fd4 调度命令 2022-09-29 17:57:47 +08:00
tiger_zhou
2ad5ff7e8b 语音识别，合成重构 调整 2022-09-29 17:51:21 +08:00
tiger_zhou
480553625e Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-09-29 17:48:07 +08:00
tiger_zhou
21928877d8 语音识别，合成重构， 2022-09-29 17:47:48 +08:00
xzb
9b94c39826 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-09-29 17:36:33 +08:00
xzb
5c647108a7 paper composition rule 2022-09-29 17:36:05 +08:00
joylink_zhangsai
88434943e2 Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-09-29 16:50:34 +08:00
joylink_zhangsai
55f0856010 删除无用消息类型 2022-09-29 16:50:15 +08:00
weizhihong
c6abb97709 【添加项目View BUG】 2022-09-29 16:42:28 +08:00
tiger_zhou
db0222843f Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-09-29 16:34:14 +08:00
weizhihong
794a86e690 【组织实体对象】 2022-09-29 16:32:53 +08:00
weizhihong
9e70e4d223 【登录时组织信息】 2022-09-29 16:31:52 +08:00
weizhihong
fde7baef6d 【空指针问题解决】 2022-09-29 16:30:33 +08:00
weizhihong
e82075281c 【增加项目信息】 2022-09-29 16:29:23 +08:00
weizhihong
a6470891a4 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2 2022-09-29 16:22:55 +08:00
weizhihong
5a7092360a 【增加顶级组织ID方法】 2022-09-29 16:22:46 +08:00
tiger_zhou
4f138401db Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-09-29 15:57:05 +08:00
joylink_zhangsai
435758678c 注释闸机状态代码 2022-09-29 15:10:42 +08:00
joylink_zhangsai
23d116c060 删除废代码 2022-09-29 15:08:40 +08:00
xzb
a6778a0a58 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-09-29 14:46:06 +08:00
xzb
b2adc808e3 paper 2022-09-29 14:45:41 +08:00
joylink_zhangsai
8ab5cf63f8 修改iscs消息发布的路径选择bug 2022-09-29 14:09:40 +08:00
weizhihong
c40ce1e2dd 【 项目查询增加名称、code筛选参数】 2022-09-29 10:26:35 +08:00
tiger_zhou
9dc4a55d17 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-09-29 09:00:18 +08:00
xzb
80b3106cfa Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-09-28 18:02:21 +08:00
xzb
5b8e0049e4 paper 2022-09-28 18:01:55 +08:00
joylink_zhangsai
d1f6e14f42 增加从仿真中获取iscs状态逻辑；增加闸机设备 2022-09-28 17:44:26 +08:00
weizhihong
d6f7618ba9 【项目查询列表全数据查询】 2022-09-28 17:36:36 +08:00
weizhihong
7b2e488882 [项目修改BUG] 2022-09-28 17:26:48 +08:00
weizhihong
bf4bad87b1 【项目描述字段调整】 2022-09-28 16:42:11 +08:00
xzb
ac5c1ed33d Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-09-28 16:34:09 +08:00
xzb
65f46b48d4 paper 2022-09-28 16:33:52 +08:00
weizhihong
63f23cf14e Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2 2022-09-28 16:32:58 +08:00
weizhihong
bfbfcf4b3e 【项目结构调整，MINIO增加客户端管理服务类，项目project表结构变更sql】 2022-09-28 16:32:52 +08:00
xzb
29d9d76e7d paper company id 2022-09-28 15:36:48 +08:00
xzb
69014b0c71 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-09-28 14:49:45 +08:00
xzb
b2086a4c81 paper 2022-09-28 14:49:24 +08:00
tiger_zhou
87de6cb800 语音识别，合成重构 2022-09-28 13:57:32 +08:00
weizhihong
42eaa75d65 【minio工具类增加全路径查询文件，修改返回值类型】 2022-09-28 13:37:10 +08:00
weizhihong
2e44fce9f4 【项目信息编辑属性修改】 2022-09-28 09:58:56 +08:00
weizhihong
cb6b6e6516 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2 2022-09-28 09:42:07 +08:00
weizhihong
6637a945fa 【minio 上传文件】 2022-09-28 09:42:01 +08:00
joylink_zhangsai
f5f6188ff5 修改PIS发布消息bug 2022-09-28 09:05:38 +08:00
xzb
4301c32b49 paper 2022-09-27 18:01:48 +08:00
xzb
91e23d36ae paper 2022-09-27 17:59:16 +08:00
tiger_zhou
6d2faad0ae 理论试题管理代码调整 2022-09-27 15:33:47 +08:00
tiger_zhou
f28d92f793 Merge remote-tracking branch 'origin/test-training2-zhouyin' into test-training2 
# Conflicts:
#	src/main/java/club/joylink/rtss/dao/paper/PaperQuestionDAO.java
#	src/main/java/club/joylink/rtss/entity/paper/question/PaperQuestion.java
 2022-09-27 15:29:35 +08:00
tiger_zhou
66bf5f7549 理论试题管理代码调整 2022-09-27 15:28:57 +08:00
xzb
9fe24f7230 paper 2022-09-27 15:27:03 +08:00
xzb
7ae3346ad7 paper 2022-09-27 15:13:21 +08:00
xzb
7b6ab5608e paper 2022-09-27 15:11:03 +08:00
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
joylink_zhangsai
1441e973f1 Pis发布信息不再直接转语音；修改查询进路路径逻辑以排除掉空列表；修改沙盘订阅路径 2022-09-27 10:22:42 +08:00
joylink_zhangsai
dce23dbff7 地图数据处理接口增加对地图逻辑数据的处理 2022-09-27 09:14:40 +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