Commit Graph

2895 Commits

Author SHA1 Message Date
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
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
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
b82edd37b3 map_system_new建表sql 2022-10-10 13:26:36 +08:00
3264befe0a Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-10-10 13:22:31 +08:00
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
0b266b2284 修改信号机开放主信号判断逻辑以兼容国赛场景 2022-10-09 15:45:02 +08:00
weizhihong
16b035d43b 【设备管理中项目Code修改为前端指定】 2022-10-09 15:14:12 +08:00
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
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