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 |
|
