|
|
a0580a6435
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-01-17 15:54:33 +08:00 |
|
|
|
94e6169138
|
增加仿真加载草稿运行图接口
|
2023-01-17 15:54:16 +08:00 |
|
weizhihong
|
327c883c5b
|
【大铁调度台重置方法】
|
2023-01-17 14:16:51 +08:00 |
|
|
|
456d0d8f1f
|
修改加载实训时的重置仿真接口
|
2023-01-17 10:21:41 +08:00 |
|
|
|
689ab3155a
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-01-16 16:09:33 +08:00 |
|
|
|
6857404403
|
地图数据增加可访问客户端集合；大铁重置仿真增加按计划行车（之前认为大铁应自动按计划行车）
|
2023-01-16 16:09:22 +08:00 |
|
weizhihong
|
929c9a1e05
|
【大铁实训保存背景BUG】
|
2023-01-16 16:00:15 +08:00 |
|
tiger_zhou
|
7aabe2822b
|
training2 合并
|
2023-01-16 10:46:10 +08:00 |
|
tiger_zhou
|
f85636942d
|
Merge remote-tracking branch 'origin/test-training2' into test
# Conflicts:
# src/main/java/club/joylink/rtss/simulation/cbtc/GroupSimulationServiceImpl.java
# src/main/resources/application.yml
|
2023-01-16 10:33:52 +08:00 |
|
tiger_zhou
|
10b1a9f125
|
权限代码调整
|
2023-01-13 18:17:23 +08:00 |
|
tiger_zhou
|
8d07023419
|
权限代码调整
|
2023-01-13 17:47:47 +08:00 |
|
tiger_zhou
|
3a859527d8
|
权限分发支持 组织，项目，用户创建仿真对组织，项目权限的验证
|
2023-01-13 17:32:49 +08:00 |
|
tiger_zhou
|
8c10192b57
|
三方登录调整
|
2023-01-13 10:36:16 +08:00 |
|
tiger_zhou
|
731bd470e3
|
支持三方账号权限验证
|
2023-01-12 18:33:17 +08:00 |
|
tiger_zhou
|
f4acd77850
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2023-01-12 18:32:49 +08:00 |
|
tiger_zhou
|
b76aaaac77
|
对项目权限不验证验证配置
|
2023-01-11 18:02:14 +08:00 |
|
weizhihong
|
e308fb1067
|
【调整实训设备数目】
|
2023-01-11 17:59:16 +08:00 |
|
tiger_zhou
|
d88ffb7437
|
添加 对jjjlm,teaching项目权限的过滤取消
|
2023-01-11 17:38:07 +08:00 |
|
|
|
46c5fa05f4
|
修改试卷数据处理接口
|
2023-01-11 17:14:31 +08:00 |
|
|
|
650625c19f
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-01-11 16:17:46 +08:00 |
|
|
|
4dce82edb8
|
修改删减组织关联的项目时会删除所有关联关系的bug
|
2023-01-11 16:17:32 +08:00 |
|
tiger_zhou
|
31c46f8832
|
实训用户管理，数据管理可分页
|
2023-01-11 16:09:43 +08:00 |
|
weizhihong
|
2817af5adb
|
【修改实训生成设置】
|
2023-01-11 16:04:08 +08:00 |
|
tiger_zhou
|
a4eb84d63a
|
武汉8修改默认角色
|
2023-01-11 14:38:17 +08:00 |
|
|
|
8fb8671300
|
修改数据处理接口；修改大铁地图功能分组
|
2023-01-11 10:47:12 +08:00 |
|
|
|
90238254ee
|
修改地图功能默认描述
|
2023-01-10 18:16:39 +08:00 |
|
|
|
aa221c9ba2
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-01-10 17:44:12 +08:00 |
|
weizhihong
|
9cf4039365
|
【实训反序列化失败捕获】
|
2023-01-10 17:24:37 +08:00 |
|
tiger_zhou
|
7953f51000
|
修改权限数据同步结果返回的数据
|
2023-01-10 17:23:44 +08:00 |
|
tiger_zhou
|
47bb0696a5
|
权限同步时，清除所有数据
|
2023-01-10 16:51:28 +08:00 |
|
|
|
99b519bf61
|
修改创建地图功能接口以支持创建时分组
|
2023-01-10 16:42:57 +08:00 |
|
|
|
c79221112f
|
增加地图功能分组接口
|
2023-01-10 15:42:57 +08:00 |
|
weizhihong
|
050e653cd4
|
【指定地图ID、规则ID生成实训】
|
2023-01-10 14:10:07 +08:00 |
|
weizhihong
|
5900b906ca
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
|
2023-01-10 11:13:08 +08:00 |
|
weizhihong
|
24a0a5f0d2
|
【根据修改的实训规则生成实训接口】
|
2023-01-10 11:13:03 +08:00 |
|
|
|
96a3b9f40e
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-01-10 09:18:05 +08:00 |
|
|
|
cb02486a7b
|
修改一键数据处理接口
|
2023-01-10 09:17:53 +08:00 |
|
weizhihong
|
4d9343142a
|
【实训生成属性枚举】
|
2023-01-09 18:00:50 +08:00 |
|
weizhihong
|
5e207a40f2
|
【处理实训生成rule中操作参数val】
|
2023-01-09 16:43:41 +08:00 |
|
tiger_zhou
|
fe68e825a5
|
修改cgy 不需要权限验证，单操查询过滤标签调整
|
2023-01-09 15:57:26 +08:00 |
|
|
|
b1195c02ed
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-01-09 15:03:54 +08:00 |
|
|
|
70a95f0813
|
修改一键数据处理接口
|
2023-01-09 15:03:39 +08:00 |
|
weizhihong
|
9ce414e3ee
|
【实训增加控制模式车站信号机筛选】
|
2023-01-09 13:15:06 +08:00 |
|
weizhihong
|
0cb9f412f2
|
【实训增加验证参数val】
|
2023-01-09 10:58:22 +08:00 |
|
weizhihong
|
70b3bbd11e
|
【根据线路列表生成实训】
|
2023-01-09 10:32:51 +08:00 |
|
weizhihong
|
643b931bd0
|
【生成实训打印错误日志】【调整实训设备列表筛选】
|
2023-01-09 09:50:10 +08:00 |
|
weizhihong
|
a1ca799520
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
|
2023-01-06 18:18:07 +08:00 |
|
weizhihong
|
9329c973c6
|
【根据地图列表生成实训】【生成全部地图实训】
|
2023-01-06 18:17:42 +08:00 |
|
|
|
bb4abc24e1
|
增加一键数据处理接口；修改考试数据处理接口
|
2023-01-06 18:15:38 +08:00 |
|
weizhihong
|
2e24602bc0
|
【websocket接收仿真状态BUG】
|
2023-01-06 14:22:16 +08:00 |
|
weizhihong
|
8ed45050f2
|
【实训站台关闭背景丢失BUG修复】
|
2023-01-06 13:40:30 +08:00 |
|
weizhihong
|
cd33f4b8df
|
【websocket消息解析仿真ID逻辑修改】
|
2023-01-05 17:03:09 +08:00 |
|
weizhihong
|
b729f33ce8
|
【实训道岔列表】
|
2023-01-05 09:15:31 +08:00 |
|
tiger_zhou
|
8484acceb0
|
实训单操 添加接口 manage/infos，不然与仿真/infos 接口冲突
|
2023-01-04 16:45:33 +08:00 |
|
weizhihong
|
258b8199e2
|
【实训修改背景时，同步修改仿真中实训信息】
|
2023-01-04 14:33:33 +08:00 |
|
weizhihong
|
3cb7afea89
|
【场景实训运行时间控制】
|
2023-01-03 17:46:41 +08:00 |
|
weizhihong
|
e32288027b
|
【实训背景列车反序列化逻辑修改】
|
2023-01-03 16:11:04 +08:00 |
|
|
|
6385e89ce4
|
修改准备发车时间以处理国赛线路过早发车导致折返状态未更新bug
|
2023-01-03 16:05:55 +08:00 |
|
tiger_zhou
|
e4c7ac5eea
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2023-01-03 14:45:29 +08:00 |
|
tiger_zhou
|
6e47a2920f
|
实训查询支持标签的模糊匹配
|
2023-01-03 14:45:14 +08:00 |
|
|
|
c1facf84f6
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-01-03 14:08:33 +08:00 |
|
|
|
a60db73f74
|
一键生成地图功能增加运行图编制
|
2023-01-03 14:08:18 +08:00 |
|
weizhihong
|
9364dc4ced
|
【实训控制权转换增加背景判断】
|
2022-12-30 16:34:31 +08:00 |
|
weizhihong
|
4faff6bb77
|
【实训场景编制时，控制权不做自动转换】
|
2022-12-30 16:22:37 +08:00 |
|
weizhihong
|
daadb7ccee
|
【实训进路自动控背景】
|
2022-12-30 15:09:22 +08:00 |
|
tiger_zhou
|
e079307e4b
|
创建试卷 对实训标签及数量的查询
|
2022-12-30 13:24:05 +08:00 |
|
|
|
4d58238cfa
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-12-29 16:33:16 +08:00 |
|
|
|
8d5866198d
|
重新修改三维订阅路径
|
2022-12-29 16:33:04 +08:00 |
|
weizhihong
|
fc2ef5c481
|
【处理实训场景背景列车信息反序列化移动授权设备BUG】
|
2022-12-29 16:30:17 +08:00 |
|
weizhihong
|
5f7ff4b07d
|
【实训进路筛选】
|
2022-12-29 14:16:37 +08:00 |
|
weizhihong
|
695e48fc37
|
【实训宁波一人解列车进路背景修改】
|
2022-12-29 10:20:15 +08:00 |
|
weizhihong
|
fd109d60de
|
【实训进路终端信号机信息】
【地图定位信息】
【实训转中控消息处理】
【实训设备筛选规则】
|
2022-12-28 17:05:58 +08:00 |
|
weizhihong
|
a8677aa483
|
【站控消息Simulation_Control_Transfer_Result修改为Simulation_ApplyHandle】
|
2022-12-27 16:43:51 +08:00 |
|
weizhihong
|
a77a4ecaed
|
【大铁车站重启时间使用仿真时间】
|
2022-12-27 14:23:13 +08:00 |
|
weizhihong
|
0d4d91d9b8
|
【大铁实训进路筛选】
|
2022-12-27 13:34:38 +08:00 |
|
weizhihong
|
7cac4046f3
|
【修改：上电操作时间使用仿真时间】
|
2022-12-27 11:00:26 +08:00 |
|
weizhihong
|
a32c43c66d
|
【车站简写属性，道岔计轴区段筛选】
|
2022-12-26 15:52:34 +08:00 |
|
|
|
0ab30a3221
|
修改试卷数据处理逻辑；增加数据处理接口进白名单
|
2022-12-26 14:39:51 +08:00 |
|
tiger_zhou
|
c24c1c6ac7
|
权限同步调整
|
2022-12-26 13:34:25 +08:00 |
|
|
|
57f6dae0b3
|
修改试卷数据处理逻辑；修改组织-项目关系数据处理逻辑；重新生成OrgProjectDAO
|
2022-12-26 11:23:32 +08:00 |
|
weizhihong
|
3569212e57
|
【修改组织路径】
|
2022-12-26 11:03:37 +08:00 |
|
weizhihong
|
8fd8ec9f4a
|
【实训进路筛选规则】
|
2022-12-26 09:25:13 +08:00 |
|
|
|
d440e40c15
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-12-23 15:08:01 +08:00 |
|
|
|
1868fe20b6
|
增加缓存地图数据异常处理
|
2022-12-23 15:02:20 +08:00 |
|
|
|
a1f854a91f
|
苏安院增加信号机和转辙机实体设备配置和逻辑
|
2022-12-23 10:09:48 +08:00 |
|
weizhihong
|
068df9d1db
|
【注释信号机的进路条件筛选、空指针异常解决】
|
2022-12-22 13:06:47 +08:00 |
|
weizhihong
|
c2af1f6fea
|
【地图设备筛选规则修改、信号机车站获取修改】
|
2022-12-20 18:31:49 +08:00 |
|
|
|
2d78ed3d0d
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-12-20 17:18:27 +08:00 |
|
|
|
f8db529156
|
增加加载实体设备逻辑；修改获取实体设备配置的设备code的方式
|
2022-12-20 17:18:17 +08:00 |
|
weizhihong
|
07ff57162e
|
【实训信号机设备筛选规则】
|
2022-12-20 14:48:14 +08:00 |
|
|
|
1b88089ace
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-12-20 14:01:54 +08:00 |
|
|
|
cca40d0a0f
|
增加有”实体设备“加载项的地图功能同时只能存在一个仿真逻辑
|
2022-12-20 14:01:29 +08:00 |
|
weizhihong
|
7821b0cb31
|
【信号机状态背景保存】
|
2022-12-19 16:17:41 +08:00 |
|
|
|
3161a2bbbc
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-12-19 15:46:14 +08:00 |
|
|
|
15b5653083
|
新版仿真构建成员时使用既定的id而不是生成；当向仿真中重复添加某一账号的仿真用户时，将原来仿真用户取消扮演
|
2022-12-19 15:45:43 +08:00 |
|
tiger_zhou
|
04aee988b3
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-12-19 13:16:03 +08:00 |
|
tiger_zhou
|
b5afbac0be
|
权限同步调整
|
2022-12-19 13:15:48 +08:00 |
|
weizhihong
|
6ffb3c037b
|
【控制模式转换结果消息返回】
|
2022-12-19 10:10:08 +08:00 |
|
|
|
0548541ff3
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-12-14 18:22:58 +08:00 |
|
|
|
67459ddad8
|
修改方向杆数据构建bug
|
2022-12-14 18:22:42 +08:00 |
|
|
|
374390696d
|
增加检查手机号和邮箱是否已注册接口
|
2022-12-14 17:03:41 +08:00 |
|
weizhihong
|
0d66226280
|
【车站转换后，发送转换结果】
|
2022-12-14 16:46:53 +08:00 |
|
|
|
5d0a171092
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-12-14 13:14:10 +08:00 |
|
|
|
bac43f5efc
|
修改Dom配置字段名
|
2022-12-14 13:13:08 +08:00 |
|
weizhihong
|
c86d46f062
|
【实训区段关闭状态背景】
|
2022-12-14 10:53:10 +08:00 |
|
|
|
57a4ce1c5c
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-12-14 10:21:14 +08:00 |
|
|
|
ac14903b80
|
修改账号信息异常提示
|
2022-12-14 10:20:58 +08:00 |
|
weizhihong
|
f74561a760
|
【实训道岔自动状态记录】
|
2022-12-14 10:09:00 +08:00 |
|
|
|
b2be6c27db
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-12-13 18:21:36 +08:00 |
|
|
|
3f974416da
|
增加新注册接口
|
2022-12-13 18:21:21 +08:00 |
|
weizhihong
|
2a93d7fa6a
|
【生成实训中增加subtype属性】
|
2022-12-13 15:51:54 +08:00 |
|
weizhihong
|
0189a4a7fa
|
【实训操作属性增加subType】
|
2022-12-13 15:48:53 +08:00 |
|
|
|
d609881904
|
增加仿真监控接口；修改向仿真中添加用户的逻辑
|
2022-12-13 14:51:46 +08:00 |
|
tiger_zhou
|
5fa3d6706b
|
权限同步调整
|
2022-12-13 14:41:34 +08:00 |
|
|
|
94d914e8d7
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-12-13 10:24:04 +08:00 |
|
|
|
04f7327dec
|
修改线路功能是否综合演练字段名
|
2022-12-13 10:23:46 +08:00 |
|
|
|
006af3bb39
|
修改扫码绑定组织管理员接口
|
2022-12-12 18:13:28 +08:00 |
|
|
|
d36618012f
|
修改考试数据处理逻辑
|
2022-12-12 17:53:50 +08:00 |
|
weizhihong
|
9a8e43c1f2
|
【实训元素定位】
|
2022-12-12 17:37:39 +08:00 |
|
tiger_zhou
|
a9aa76685e
|
权限同步调整
|
2022-12-12 16:51:29 +08:00 |
|
weizhihong
|
12a7cb5d4d
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
|
2022-12-12 16:14:45 +08:00 |
|
weizhihong
|
2021702a7d
|
【实训设备、定位、属性值】
|
2022-12-12 16:14:36 +08:00 |
|
tiger_zhou
|
aacec609a8
|
权限同步调整
|
2022-12-12 15:54:09 +08:00 |
|
weizhihong
|
30ef80efa4
|
【实训定位问题】
|
2022-12-12 13:39:55 +08:00 |
|
|
|
63620317e7
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-12-12 11:11:43 +08:00 |
|
|
|
ec7f0d79e7
|
修改ISCS同步屏蔽门状态逻辑以兼容无屏蔽门的情况
|
2022-12-12 11:11:32 +08:00 |
|
weizhihong
|
8060290049
|
【实训增加client字段，增加人工控背景】
|
2022-12-12 10:58:55 +08:00 |
|
xzb
|
b9dddbc5cf
|
iscs v2
|
2022-12-12 10:26:42 +08:00 |
|
xzb
|
896dde1898
|
iscs v2
|
2022-12-12 10:21:22 +08:00 |
|
xzb
|
4a1a90fb76
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-12-12 10:02:04 +08:00 |
|
xzb
|
1cb123cc96
|
iscs v2
|
2022-12-12 10:01:37 +08:00 |
|
weizhihong
|
ebabaf133d
|
【实训定位修改】
|
2022-12-09 18:22:15 +08:00 |
|
|
|
b4a7bef3f6
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-12-09 18:04:48 +08:00 |
|
|
|
e81fa4548d
|
解除对Org.projectCode的使用
|
2022-12-09 18:04:38 +08:00 |
|
tiger_zhou
|
d6fbd17c55
|
教学考试调整
|
2022-12-09 17:33:30 +08:00 |
|
weizhihong
|
68f31787e4
|
【生成实训的背景、设备、属性获取】
|
2022-12-09 17:26:41 +08:00 |
|
xzb
|
a1c9d21e02
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-12-09 15:15:43 +08:00 |
|
xzb
|
54a85c3040
|
iscs v2
|
2022-12-09 15:15:18 +08:00 |
|
tiger_zhou
|
e1404f92c7
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-12-09 15:13:06 +08:00 |
|
tiger_zhou
|
f345ccae07
|
教学考试调整
|
2022-12-09 15:12:38 +08:00 |
|
xzb
|
4a95a12fee
|
iscs v2
|
2022-12-09 13:18:30 +08:00 |
|
xzb
|
89d20afa7f
|
iscs v2
|
2022-12-09 13:08:41 +08:00 |
|
xzb
|
812058e0d4
|
iscs v2
|
2022-12-09 10:01:59 +08:00 |
|
xzb
|
8663b12acc
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-12-08 17:49:29 +08:00 |
|
xzb
|
11b070112e
|
iscs v2
|
2022-12-08 17:48:28 +08:00 |
|
xzb
|
6632908b24
|
iscs v2
|
2022-12-08 17:41:10 +08:00 |
|
xzb
|
d1376b7ec2
|
iscs v2
|
2022-12-08 17:33:17 +08:00 |
|
xzb
|
8e3aa9ebb2
|
iscs v2
|
2022-12-08 17:32:33 +08:00 |
|
xzb
|
a303d773cf
|
iscs v2
|
2022-12-08 17:31:20 +08:00 |
|
xzb
|
e42741d3f3
|
iscs v2
|
2022-12-08 17:00:49 +08:00 |
|
weizhihong
|
4a82fe3ccf
|
【实训设备筛选修改】
|
2022-12-08 16:31:02 +08:00 |
|
|
|
7ef02b4ce4
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-12-08 16:21:13 +08:00 |
|
|
|
e875d1160d
|
组织接口准备换新；项目设备查询接口修改
|
2022-12-08 16:12:58 +08:00 |
|
xzb
|
c601eae73f
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-12-08 15:44:09 +08:00 |
|
xzb
|
71e2b20935
|
iscs v2
|
2022-12-08 15:43:44 +08:00 |
|
weizhihong
|
d5ff5dc681
|
【实训生成设备筛选】
|
2022-12-08 15:33:02 +08:00 |
|
xzb
|
a3deb1b327
|
iscs v2
|
2022-12-08 15:22:54 +08:00 |
|
xzb
|
02d7e7522d
|
iscs v2
|
2022-12-08 15:02:36 +08:00 |
|
xzb
|
3bfa4472b3
|
iscs v2
|
2022-12-08 14:26:44 +08:00 |
|
xzb
|
070dcd41ec
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-12-08 13:58:50 +08:00 |
|
xzb
|
7e85bc2001
|
iscs v2
|
2022-12-08 13:58:27 +08:00 |
|
weizhihong
|
f2a0c89213
|
【实训仿真初始化修改】
|
2022-12-08 11:27:50 +08:00 |
|
xzb
|
0d19ea6db8
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-12-08 10:35:57 +08:00 |
|
xzb
|
7ae3aad5bc
|
iscs v2
|
2022-12-08 10:34:43 +08:00 |
|
weizhihong
|
1fbe684487
|
【实训生成设备筛选、背景生成逻辑修改】
|
2022-12-08 10:17:59 +08:00 |
|
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 |
|
|
|
f16362af53
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-12-06 17:34:29 +08:00 |
|
|
|
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 |
|
|
|
38868f2ea7
|
Exam->PaperComposition;UserExam->PaperUser
|
2022-12-06 10:50:52 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
e3ff068d5c
|
Org->RtsOrgProject
|
2022-12-05 16:50:27 +08:00 |
|
|
|
dace38e27c
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-12-05 15:50:36 +08:00 |
|
|
|
c059b43500
|
vrTrain背景保存bug修改；移除vrTrain里的Audio
|
2022-12-05 15:50:25 +08:00 |
|
weizhihong
|
219267c455
|
【生成实训规则修改】
|
2022-12-05 15:48:26 +08:00 |
|
|
|
9e7fe0c336
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-12-05 15:08:15 +08:00 |
|
|
|
e5aa725dca
|
修改StorageVirtualRealityTrain；增加一个粗糙的Storage类生成工具
|
2022-12-05 15:07:56 +08:00 |
|
xzb
|
9f53eb27df
|
iscs v2
|
2022-12-05 10:30:17 +08:00 |
|
joylink_zhangsai
|
bdbee678f9
|
苏安院屏蔽门监控逻辑修改
|
2022-12-04 23:20:38 +08:00 |
|
joylink_zhangsai
|
d844da103a
|
Merge remote-tracking branch 'origin/test' into test
|
2022-12-04 19:48:59 +08:00 |
|
joylink_zhangsai
|
4530495274
|
苏安院屏蔽门监控逻辑
|
2022-12-04 19:48:49 +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 |
|
|
|
ddaf91647a
|
修改地铁仿真初始化逻辑
|
2022-12-02 11:26:52 +08:00 |
|
|
|
d285b24d66
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-12-02 10:47:15 +08:00 |
|
|
|
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 |
|
|
|
ce4744f519
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-12-01 16:42:48 +08:00 |
|
|
|
15fa4924a2
|
修改仿真id生成规则（mapId-userId）；为了加快项目重启后进入仿真的速度，重启后缓存所有在线地图数据
|
2022-12-01 16:42:37 +08:00 |
|
tiger_zhou
|
9823d64553
|
应急系统日志调整
|
2022-12-01 14:51:01 +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 |
|
|
|
adbfedbff0
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-12-01 14:19:56 +08:00 |
|
|
|
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 |
|
|
|
977029410d
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-12-01 13:08:53 +08:00 |
|
|
|
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 |
|
|
|
993c081dbd
|
MapSystem->RtsMapFunction修改
|
2022-12-01 10:57:45 +08:00 |
|
|
|
13a7f01a77
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-12-01 10:57:10 +08:00 |
|
|
|
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 |
|
|
|
45882142b3
|
增加MapSystem->RtsMapFunction数据转化接口
|
2022-11-30 15:43:01 +08:00 |
|
weizhihong
|
27a4dbd5b2
|
【进路列表筛选】
|
2022-11-30 14:48:24 +08:00 |
|
|
|
9871e37f81
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-11-30 14:01:29 +08:00 |
|
|
|
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 |
|
|
|
3974e96c99
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-11-30 10:25:43 +08:00 |
|
|
|
bc160fdf35
|
暂时取消加入仿真的综合演练仿真检查
|
2022-11-30 10:25:17 +08:00 |
|
weizhihong
|
2da9680c6f
|
【修改创建会话逻辑】
|
2022-11-29 16:59:13 +08:00 |
|
|
|
078a49471e
|
加载背景时，仿真的运行图已加载才发布运行图重载事件
|
2022-11-29 14:11:38 +08:00 |
|
|
|
2e6c06c0cc
|
修改按计划行车请求方法(上次改错了）
|
2022-11-29 13:56:13 +08:00 |
|
|
|
6338ccce21
|
修改按计划行车请求方法
|
2022-11-29 13:52:04 +08:00 |
|
|
|
c176030f8e
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-11-29 10:35:36 +08:00 |
|
|
|
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 |
|
|
|
f77404029b
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-11-28 14:56:36 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
joylink_zhangsai
|
73f72282f6
|
修改组织试卷查询逻辑
|
2022-11-25 16:15:34 +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 |
|
|
|
381d495cae
|
Merge remote-tracking branch 'origin/master-huawei' into master-huawei
|
2022-11-21 20:27:39 +08:00 |
|
|
|
33cfae86be
|
修改苏安院实体IBP盘逻辑
|
2022-11-21 20:27:24 +08:00 |
|
|
|
61b2ffcb03
|
修改调度大赛权限校验
|
2022-11-21 18:19:54 +08:00 |
|
|
|
2143f8b302
|
增加苏安院实体IBP盘逻辑
|
2022-11-21 11:22:40 +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 |
|
|
|
e379a0a95f
|
增加订阅设备状态时发送所有设备状态逻辑
|
2022-11-08 10:16:52 +08:00 |
|
|
|
b4f7b305b6
|
新版仿真恢复大客流任务加载逻辑
|
2022-11-07 18:01:04 +08:00 |
|
tiger_zhou
|
380bc6df65
|
用户权限同步调整，北交大登录按照通用方式
|
2022-11-07 17:11:50 +08:00 |
|
|
|
f132220891
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-11-07 17:08:59 +08:00 |
|
|
|
8092557b56
|
增加ws路径；增加Dom参数
|
2022-11-07 17:08:43 +08:00 |
|
tiger_zhou
|
502db59fdc
|
用户权限同步调整
|
2022-11-04 11:00:05 +08:00 |
|
