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 |
|
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 |
|
|
|
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 |
|
weizhihong
|
16b035d43b
|
【设备管理中项目Code修改为前端指定】
|
2022-10-09 15:14:12 +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 |
|
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 |
|
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 |
|
tiger_zhou
|
111b1f0de5
|
语音识别，合成重构调整
|
2022-09-30 16:48:02 +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 |
|
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 |
|
|
|
88434943e2
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-09-29 16:50:34 +08:00 |
|
|
|
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 |
|
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 |
|
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 |
|
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 |
|
