Commit Graph

124 Commits

Author SHA1 Message Date
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
tiger_zhou
d179313877 修改考试蓝图 map_id 不能为空 2022-12-05 17:04:21 +08:00
xzb
9f53eb27df iscs v2 2022-12-05 10:30:17 +08:00
tiger_zhou
a299c3471f 权限同步调整,及应急系统日志调整 2022-12-01 14:07:46 +08:00
weizhihong
2c360a2c00 【项目设置增加地图ID、功能ID】 2022-11-24 17:23:53 +08:00
weizhihong
31688227ed 【创建仿真时,保存功能ID】
【根据地图ID与功能ID获取仿真】
【组织用户管理接口】
【实训增加client字段】
2022-11-23 16:50:31 +08:00
weizhihong
55abfd21b2 【实训草稿存档功能】 2022-11-14 18:07:59 +08:00
ddfa763746 地图子系统改线路功能 2022-10-31 14:31:56 +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
weizhihong
7b208af820 【修改实训,增加子系统、客户端字段】 2022-10-27 17:12:14 +08:00
weizhihong
6a7d89bfe5 【修改表名】 2022-10-25 13:31:42 +08:00
tiger_zhou
c856280724 答题试卷可以重复答题,并且修改的时候返回上次答题的答案 2022-10-24 10:18:00 +08:00
weizhihong
933a73d131 【去除项目前端唯一索引】 2022-10-17 15:01:41 +08:00
tiger_zhou
c68978cd1b 理论试题管理代码调整 2022-10-17 14:19:13 +08:00
tiger_zhou
1910f7a1c7 理论试题管理代码调整 2022-10-17 14:02:05 +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
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
b50d1ead24 新仿真结构完善中 2022-10-14 14:57:30 +08:00
xzb
dcf41945aa paper 2022-10-12 17:52:18 +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
2745d4950b 【项目增加默认组织字段,去除前端选择项目字段】 2022-10-12 14:11:58 +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
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
xzb
be1dc7de2e paper 2022-10-09 18:03:24 +08:00
tiger_zhou
1e18878c67 已发布实训添加查询维度(名称,地图,类型,标签及组织) 2022-10-09 16:09:12 +08:00
tiger_zhou
df5ddc40bc 理论试题管理sql脚本调整 2022-10-09 11:26:38 +08:00
xzb
70a8cfae9f paper 2022-10-08 15:22:26 +08:00
weizhihong
1dd77a87b9 【MINIO上传的文件信息保存】 2022-09-30 14:57:34 +08:00
weizhihong
aadd300cb8 【MINIO上传文件信息保存接口,登录选组织信息操作】 2022-09-30 14:26:18 +08:00
weizhihong
01aad063c9 【组织、项目关联关系;登录获取项目的组织信息;选择登录组织】 2022-09-29 18:12:27 +08:00
weizhihong
bfbfcf4b3e 【项目结构调整,MINIO增加客户端管理服务类,项目project表结构变更sql】 2022-09-28 16:32:52 +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
weizhihong
f2ab1f945d 【项目前端配置中增加图标连接信息】 2022-09-26 10:11:11 +08:00
weizhihong
6178310259 【去除sql文件中的编码设置】 2022-09-23 17:01:24 +08:00
weizhihong
b580ca0313 【sql文件说明】 2022-09-23 16:58:25 +08:00
weizhihong
b666ac0bd7 【将項目前端配置与后端配置分离,处理重新处理表结构】 2022-09-23 16:48:48 +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
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
weizhihong
23f2494de7 【项目配置相关、实训操作参数对比】 2022-09-22 16:55:51 +08:00
weizhihong
3a2803bb5e 【项目配置管理接口】 2022-09-22 13:36:03 +08:00
tiger_zhou
226d5d62b1 理论试题管理 2022-09-21 17:26:58 +08:00
tiger_zhou
9b5c3b2dbc Merge branch 'test' into test-training2-zhouyin
# Conflicts:
#	src/main/java/club/joylink/rtss/constants/MapPrdTypeEnum.java
#	src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/NewAtsTrainLoadService.java
#	src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/TrainPositionService.java
#	src/main/java/club/joylink/rtss/simulation/cbtc/SimulationLifeCycleServiceImpl.java
#	src/main/java/club/joylink/rtss/vo/client/factory/SocketMessageFactory.java
#	src/main/java/club/joylink/rtss/vo/ws/TrainPosition.java
#	src/main/java/club/joylink/rtss/websocket/WebSocketController.java
#	src/main/java/club/joylink/rtss/websocket/WebsocketConfig.java
#	src/main/java/club/joylink/rtss/websocket/client/StompClientManager.java
2022-09-20 16:48:27 +08:00
xzb
4015a5f2fd 通过地图逻辑数据存储调度台数据 2022-09-19 15:05:58 +08:00