tiger_zhou
|
8728d9ffa0
|
Merge branch 'test-training2'
|
2023-02-20 09:27:44 +08:00 |
|
tiger_zhou
|
eb81ea59dc
|
用户登录不显示个人权限
|
2023-02-20 09:25:48 +08:00 |
|
tiger_zhou
|
94c07b26dc
|
Merge branch 'test-training2'
|
2023-02-17 18:42:55 +08:00 |
|
tiger_zhou
|
75a1fa43cc
|
权限时间调整
|
2023-02-17 18:42:02 +08:00 |
|
tiger_zhou
|
9b12e5adcb
|
Merge remote-tracking branch 'origin/test-training2'
|
2023-02-17 18:19:03 +08:00 |
|
tiger_zhou
|
f074c4db94
|
权限时间调整
|
2023-02-17 18:16:59 +08:00 |
|
weizhihong
|
5d3a8905c2
|
【单操实训增加组织过滤】【项目过滤无效项目】
|
2023-02-17 17:42:25 +08:00 |
|
weizhihong
|
977834cd4e
|
【分散自律操作模式切换BUG处理】
|
2023-02-17 15:34:47 +08:00 |
|
weizhihong
|
eac12826d1
|
【分散自律同意、不同意逻辑处理】
|
2023-02-17 14:21:52 +08:00 |
|
weizhihong
|
aad3a16d5b
|
【车站控制操作模式BUG处理】
|
2023-02-17 09:56:45 +08:00 |
|
|
|
9f28c2f8ee
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-02-16 17:30:21 +08:00 |
|
|
|
ae801cb061
|
修改机器人驾驶代码使逻辑更清晰，并解决地铁线路站台轨不停车的问题
|
2023-02-16 17:30:00 +08:00 |
|
weizhihong
|
3cc442b0fa
|
【车站模式申请消息返回格式修改】
|
2023-02-16 14:10:18 +08:00 |
|
weizhihong
|
8cfa715e37
|
【修改实训运行逻辑：只有在场景情况下判断等待时间】
|
2023-02-16 13:33:14 +08:00 |
|
|
|
233b1b1ff2
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-02-16 11:13:27 +08:00 |
|
|
|
33dc36a6af
|
修改地图功能默认描述；增加批量修改地图功能描述接口
|
2023-02-16 11:12:03 +08:00 |
|
weizhihong
|
e748120a8d
|
【实训执行逻辑、更新步骤参数修改】
|
2023-02-15 18:13:53 +08:00 |
|
weizhihong
|
6689da99ee
|
【区故解延时解锁，增加进路锁闭条件】
|
2023-02-15 17:09:43 +08:00 |
|
|
|
cf5b5e8919
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-02-15 17:08:02 +08:00 |
|
tiger_zhou
|
963d0e0710
|
考试调整
|
2023-02-15 16:57:43 +08:00 |
|
|
|
b409263cf8
|
修改ATS界面开关门操作，使用更直接的逻辑
|
2023-02-15 15:26:47 +08:00 |
|
|
|
a45f0a3295
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-02-15 14:11:01 +08:00 |
|
|
|
7bc7fdeaee
|
地图功能增加bgUrl返回
|
2023-02-15 14:10:44 +08:00 |
|
tiger_zhou
|
db0ba127ed
|
试卷场景分数调整
|
2023-02-15 13:43:16 +08:00 |
|
weizhihong
|
be8c515eea
|
【车站操作模式转换逻辑调整】
|
2023-02-15 12:55:44 +08:00 |
|
|
|
55c93799c2
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-02-15 11:19:36 +08:00 |
|
|
|
2f162fdaaa
|
地图功能增加背景图片url；修改ATS界面开关门操作以确保成功
|
2023-02-15 11:19:25 +08:00 |
|
weizhihong
|
ddb5f69705
|
【车站模式操作支持多车站切换】
|
2023-02-15 11:07:22 +08:00 |
|
weizhihong
|
2d59c54f87
|
【模式申请增加超过两分钟直接驳回处理】
|
2023-02-15 10:30:54 +08:00 |
|
|
|
5aec3edb8d
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-02-15 09:54:43 +08:00 |
|
|
|
a3846f459b
|
修改列车停站后无法开站台门bug
|
2023-02-15 09:54:30 +08:00 |
|
tiger_zhou
|
6a0a8477f2
|
应急ws调整
|
2023-02-14 17:43:32 +08:00 |
|
|
|
6d37169068
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-02-14 17:33:44 +08:00 |
|
|
|
8463e2ff57
|
ATS的开关门操作增加修改门选择逻辑
|
2023-02-14 17:33:32 +08:00 |
|
tiger_zhou
|
5cb582f23c
|
应急ws调整
|
2023-02-14 14:19:14 +08:00 |
|
tiger_zhou
|
007e479755
|
应急ws调整
|
2023-02-14 13:34:06 +08:00 |
|
tiger_zhou
|
a0419ab218
|
应急ws调整
|
2023-02-14 13:25:38 +08:00 |
|
tiger_zhou
|
8eaf0206d0
|
考试调整，应急ws调整
|
2023-02-14 11:29:28 +08:00 |
|
|
|
85e678e90f
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-02-14 11:10:09 +08:00 |
|
|
|
4618aa502e
|
修改测试环境minio配置
|
2023-02-14 11:09:21 +08:00 |
|
weizhihong
|
47956c3a79
|
【字符串修改成枚举】
|
2023-02-14 10:44:12 +08:00 |
|
weizhihong
|
5bdad2aaa7
|
【增加保存背景时车站的属性】
|
2023-02-13 17:48:04 +08:00 |
|
tiger_zhou
|
e00957e92d
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2023-02-13 16:59:13 +08:00 |
|
tiger_zhou
|
1f6d31649e
|
应急调度速度显示调整
|
2023-02-13 16:58:54 +08:00 |
|
tiger_zhou
|
8a50f9a380
|
应急调度速度显示调整
|
2023-02-13 16:42:38 +08:00 |
|
|
|
7ab99bea9c
|
Merge branch 'test' into test-training2
|
2023-02-13 15:12:31 +08:00 |
|
tiger_zhou
|
9f8b47147d
|
修改用户登录前端有时无法获取orgId,
考试调整
|
2023-02-13 14:36:08 +08:00 |
|
|
|
a52faffc4f
|
处理报错
|
2023-02-13 14:31:07 +08:00 |
|
|
|
3aeeba78cf
|
Merge remote-tracking branch 'origin/test' into test
|
2023-02-13 11:22:29 +08:00 |
|
|
|
12ad180057
|
Merge branch 'test-training2' into test
|
2023-02-13 10:11:59 +08:00 |
|
weizhihong
|
382d28ca31
|
【实训道岔定反、单锁解、转动联动验证处理】
|
2023-02-10 18:26:44 +08:00 |
|
|
|
0a817bdb82
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-02-10 17:09:57 +08:00 |
|
|
|
47a9e54e16
|
仿真基础信息增加联动道岔数据
|
2023-02-10 17:09:34 +08:00 |
|
weizhihong
|
6791174f2b
|
【车站分散自律操作模式方式切换处理】【簿册背景保存】
|
2023-02-10 16:50:13 +08:00 |
|
tiger_zhou
|
4dc1fd6b09
|
场景考试
|
2023-02-10 16:06:14 +08:00 |
|
tiger_zhou
|
8b491a0233
|
场景考试
|
2023-02-10 15:45:28 +08:00 |
|
|
|
df4ea3ed59
|
修改大铁加载列车条件
|
2023-02-10 14:00:07 +08:00 |
|
|
|
f668c04919
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-02-10 11:16:19 +08:00 |
|
|
|
265bb3284c
|
因三维无法维护，故决定将司机操作在ATS界面执行，所以需要[司机不是机器人则操作无效]此类限制；增加单元测试
|
2023-02-10 11:16:04 +08:00 |
|
weizhihong
|
e3d0169bbe
|
【增加电力工务角色】
|
2023-02-09 17:36:04 +08:00 |
|
weizhihong
|
4d5bc197fd
|
【实训修改为场景类型时，清空地图定位】
|
2023-02-09 16:22:39 +08:00 |
|
weizhihong
|
e9c3b3fd57
|
【车站功能选择切换操作】
|
2023-02-09 15:21:58 +08:00 |
|
weizhihong
|
5dd0fff5cc
|
【实训短时间多操作触发处理，实训时间控制】
|
2023-02-09 14:14:26 +08:00 |
|
tiger_zhou
|
52477be1a1
|
单操考试调整
|
2023-02-08 15:58:44 +08:00 |
|
tiger_zhou
|
899c5e2e0f
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2023-02-08 15:26:03 +08:00 |
|
tiger_zhou
|
661d09ea3f
|
单操考试调整
|
2023-02-08 15:16:10 +08:00 |
|
|
|
ecdb7b9b9f
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-02-08 15:11:10 +08:00 |
|
|
|
a33c94a477
|
修改大铁列车提速后停不准的问题
|
2023-02-08 15:10:54 +08:00 |
|
tiger_zhou
|
1a1d67bc5c
|
仿真鉴权数量调整
|
2023-02-08 14:43:15 +08:00 |
|
|
|
b13b2e6cbb
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-02-08 14:10:20 +08:00 |
|
|
|
9a11d2839a
|
PSL、IBP操作接口改为仿真指令；班级添加学生增加通过手机号关联功能；大铁列车速度上限改为320km/h
|
2023-02-08 14:10:09 +08:00 |
|
weizhihong
|
08e68a515c
|
【引导按钮增加属性 direction】
|
2023-02-08 14:07:01 +08:00 |
|
weizhihong
|
1fc13f4eb3
|
【CTC办理进路增加分路不良卡控】
|
2023-02-08 13:41:24 +08:00 |
|
tiger_zhou
|
6a9a3f9a1b
|
仿真鉴权数量调整
|
2023-02-08 13:15:00 +08:00 |
|
weizhihong
|
1cf48486b1
|
【单操实训结束接口修改】【CTC分路不良修改】
|
2023-02-08 10:36:29 +08:00 |
|
tiger_zhou
|
3ecdeac6c3
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2023-02-07 18:07:24 +08:00 |
|
tiger_zhou
|
c738dcc6c5
|
仿真鉴权调整
|
2023-02-07 18:07:09 +08:00 |
|
weizhihong
|
2ffedfc0a5
|
【CTC 岔前、定位、反位区段不良操作】
|
2023-02-07 17:53:52 +08:00 |
|
tiger_zhou
|
1b3fee07af
|
创建仿真调整
|
2023-02-07 17:26:03 +08:00 |
|
tiger_zhou
|
296e1fb4f8
|
仿真鉴权支持数量，考试对单操修改
|
2023-02-07 16:49:05 +08:00 |
|
weizhihong
|
fb6b81c56f
|
【生成实训创建仿真时，取消权限检查】
|
2023-02-07 14:52:50 +08:00 |
|
weizhihong
|
efb8401693
|
【簿册背景实训序列化处理】【办理引导进路半闭塞时信号报错】
|
2023-02-07 14:07:58 +08:00 |
|
weizhihong
|
64a3b33c6c
|
【处理辅助状态信号机不开灯状态（大铁）】
|
2023-02-06 09:33:56 +08:00 |
|
weizhihong
|
029e536c81
|
【大铁进路开信号逻辑修改】
|
2023-02-03 16:08:30 +08:00 |
|
|
|
6e8c08aec7
|
修改大铁生成进路逻辑
|
2023-02-03 15:45:34 +08:00 |
|
|
|
d1635f0c4e
|
上次提交的补充
|
2023-02-03 13:46:03 +08:00 |
|
|
|
e8ccdef987
|
修改[大铁进路解锁时，有些锁定道岔未解锁]问题
|
2023-02-03 13:35:17 +08:00 |
|
weizhihong
|
7c7c87cc5e
|
【大铁线路根据车次查询列车编号】
|
2023-02-02 16:15:19 +08:00 |
|
weizhihong
|
581def3bb3
|
【大铁出入口判断进路开放逻辑修改】
|
2023-02-02 14:05:24 +08:00 |
|
weizhihong
|
a3d245346f
|
【防洪安全上岗签到表添加接口】
|
2023-02-02 10:16:49 +08:00 |
|
|
|
fff58f8ec4
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-02-01 17:51:11 +08:00 |
|
|
|
7e85189deb
|
生成的【调度台】线路功能不再具有成员管理菜单
|
2023-02-01 17:50:56 +08:00 |
|
weizhihong
|
5d08b5bd1e
|
【行车设备施工登记簿、交接班记录簿（区段站、中间站、外勤助理、调车区长、调度员、车号长）录入查询】
|
2023-02-01 14:46:40 +08:00 |
|
weizhihong
|
86f8820453
|
【行车设备施工登记簿信息】
|
2023-01-31 18:02:36 +08:00 |
|
tiger_zhou
|
b4e785284f
|
试卷生成理论题调整
|
2023-01-31 14:13:44 +08:00 |
|
tiger_zhou
|
712da01cc3
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2023-01-31 14:13:19 +08:00 |
|
tiger_zhou
|
68bbde3029
|
考试规则数量，标签 针对实训线路过滤调整
|
2023-01-31 10:57:44 +08:00 |
|
weizhihong
|
ce21de71ba
|
【非正常情况接发列车关键环节控制表信息保存、更新、查询操作】
|
2023-01-31 10:42:15 +08:00 |
|
tiger_zhou
|
fc5b8721b7
|
考试生成试卷，考试规则数量，标签 针对实训线路过滤
|
2023-01-31 10:11:45 +08:00 |
|
tiger_zhou
|
40875c44db
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2023-01-31 10:08:18 +08:00 |
|
|
|
5337333402
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2023-01-30 17:42:15 +08:00 |
|
|
|
8d9e571566
|
修改大铁调车进路生成逻辑
|
2023-01-30 17:42:01 +08:00 |
|
tiger_zhou
|
9c360f0788
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2023-01-30 17:21:55 +08:00 |
|
tiger_zhou
|
a5691df153
|
调整考试实训类型类型属性无法找到问题
|
2023-01-30 11:11:23 +08:00 |
|
weizhihong
|
6f9d9bf5b7
|
【修改出入口卡控默认值】
|
2023-01-30 09:40:01 +08:00 |
|
|
|
2a9d51d629
|
Merge remote-tracking branch 'origin/master'
|
2023-01-29 15:39:03 +08:00 |
|
weizhihong
|
39d7bd76bf
|
【实训更新步骤是用户角色列表自然排序】
|
2023-01-18 14:44:01 +08:00 |
|
weizhihong
|
27adab3586
|
【大铁列车到点上线逻辑修改】
|
2023-01-18 10:19:36 +08:00 |
|
weizhihong
|
97184b1867
|
【大铁调度命令背景保存】
|
2023-01-17 16:43:57 +08:00 |
|
|
|
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 |
|
