joylink/rt-sim-training-service
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 10 Wiki Activity
2,128 Commits 12 Branches 10 Tags 54 MiB
b892606e76
Commit Graph

2069 Commits

Author SHA1 Message Date
joylink_zhangsai
0ffee9e292 Merge remote-tracking branch 'origin/test' into test 2022-05-11 13:19:29 +08:00
weizhihong
6122643c1f 【发车方向逻辑】 2022-05-10 17:54:05 +08:00
weizhihong
31dd4220f3 【发车方向逻辑BUG】 2022-05-10 17:52:31 +08:00
weizhihong
a7e4ec2fd2 【删除多余代码】 2022-05-10 15:54:45 +08:00
weizhihong
0ea10f07f8 【运行方向接发状态逻辑修改】 2022-05-10 15:49:48 +08:00
joylink_zhangsai
a646deaaca 增加大铁通过信号机的信号显示控制逻辑；恢复机器人驾驶看信号的逻辑 2022-05-10 15:44:17 +08:00
weizhihong
9e4375364b 【增加车站筛选，减小筛选范围】 2022-05-10 10:51:27 +08:00
weizhihong
39ac31901f 【运行方向箭头亮灯逻辑问题修复】 2022-05-10 10:03:23 +08:00
joylink_zhangsai
d4b8a99f50 增加生成通过进路逻辑（大铁）；修改进路办理条件检查及办理流程以兼容通过进路 2022-05-09 17:01:58 +08:00
weizhihong
cd66dc8056 【地图删除操作，清理运行方向草稿数据】 2022-05-09 15:06:03 +08:00
weizhihong
1c10b6abcc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test 2022-05-09 11:17:01 +08:00
weizhihong
9815515f93 【事故按钮操作】 
【半自动闭塞复原逻辑修改】
【自动闭塞接发车灯逻辑修改】
 2022-05-09 11:16:54 +08:00
joylink_zhangsai
cd1307318e 进路延时解锁会导致信号机降至关闭级 2022-05-07 13:17:47 +08:00
joylink_zhangsai
cdf2552bde Merge remote-tracking branch 'origin/test' into test 2022-05-07 10:32:42 +08:00
joylink_zhangsai
e80a93729c 修改引导、引导总锁逻辑 2022-05-07 10:32:32 +08:00
weizhihong
a168017970 【增加地图数据异常判断】 2022-05-07 09:50:08 +08:00
weizhihong
b213ddc9ac 【准备状态修改】 
【发车灯逻辑判断修改】
 2022-05-06 18:10:49 +08:00
weizhihong
c09bed0506 【改方取消停车验证】 2022-05-06 17:33:05 +08:00
weizhihong
dc3f74d8fb 【半自动闭塞闭塞BUG处理】 2022-05-06 16:54:01 +08:00
weizhihong
f6439fbd83 【半闭塞、自动闭塞接发车灯逻辑跳转】 2022-05-06 16:15:30 +08:00
weizhihong
489a6930da 【半自动点灯、复原操作】 2022-05-06 09:57:40 +08:00
weizhihong
2cffbf1d56 【双红操作、列车经过判断】 2022-05-05 19:02:09 +08:00
weizhihong
0e950db851 【半自动操作：事故按钮、闭塞、复原操作】（未测试） 2022-05-05 18:14:01 +08:00
joylink_zhangsai
e63664b6d2 Merge remote-tracking branch 'origin/test' into test 2022-05-05 16:37:17 +08:00
joylink_zhangsai
9136e3e19e 增加<是大铁线路？>联锁生成配置 2022-05-05 16:37:05 +08:00
joylink_zhangsai
0a7c4b2533 大铁生成进路逻辑（增加调车进路生成逻辑） 2022-05-05 16:04:05 +08:00
weizhihong
f835731df5 【半自动闭塞、复原逻辑代码】 2022-05-05 10:52:50 +08:00
joylink_zhangsai
d1837c50ec Merge remote-tracking branch 'origin/test' into test 2022-04-29 18:56:58 +08:00
joylink_zhangsai
f156844f6a 大铁生成进路逻辑（未完） 2022-04-29 18:56:47 +08:00
weizhihong
0ed54505bc 【增加辅助按钮、辅助灯操作】 
【删除多余代码】
 2022-04-29 11:24:23 +08:00
weizhihong
bd59012519 【消息体增加运行方向状态】 2022-04-28 18:17:49 +08:00
weizhihong
c56e657ecf 【接发辅助灯状态逻辑重写】 
【辅助按钮操作（逻辑未完成）】
 2022-04-28 17:01:01 +08:00
joylink_zhangsai
765d830bed Merge remote-tracking branch 'origin/test' into test 2022-04-28 15:29:11 +08:00
joylink_zhangsai
c04cfd0e08 大铁生成列车进路逻辑 2022-04-28 15:28:58 +08:00
weizhihong
63c9b08515 【接发灯状态判断修改】 
【发布地图时，运行方向数据回填问题修复】
 2022-04-28 14:29:44 +08:00
weizhihong
a735fbbbeb 【修改新建草稿地图BUG】 2022-04-28 10:28:35 +08:00
weizhihong
ad19c56331 【列车运行方向逻辑重构】 2022-04-27 17:08:19 +08:00
joylink_zhangsai
5b6f5ab8df 修改小bug 2022-04-27 14:17:51 +08:00
joylink_zhangsai
933b9f7bb6 删掉无用的文件 2022-04-26 15:11:38 +08:00
joylink_zhangsai
912c6b8612 Merge remote-tracking branch 'origin/test' into test 2022-04-26 14:20:14 +08:00
joylink_zhangsai
75fc0d0915 大铁线路2增加进路路径生成逻辑（因为没有站间运行等级和交路数据） 2022-04-26 14:19:55 +08:00
weizhihong
4d12f520d1 【改方时列车换端操作】 2022-04-25 10:15:41 +08:00
weizhihong
f83fbf0002 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test 2022-04-24 16:54:16 +08:00
joylink_zhangsai
af36dd547d 大铁CTC去掉ATS进路触发功能；修改CTC股道视图计划生成逻辑 2022-04-24 16:54:11 +08:00
weizhihong
53cb44174c 【改方BUG修复，空指针判断】 
Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-24 16:49:27 +08:00
joylink_zhangsai
67ac1683c4 Merge remote-tracking branch 'origin/test' into test 2022-04-24 15:20:20 +08:00
joylink_zhangsai
318ccb915e 修改大铁CTC流程 2022-04-24 15:20:11 +08:00
weizhihong
4f697b19fc 【去除车站判断逻辑】 
Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-24 14:23:28 +08:00
joylink_zhangsai
d95dbe982f 修改大铁CTC流程 2022-04-24 13:49:44 +08:00
weizhihong
3d59d32db7 【指示灯逻辑】 
Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-24 13:45:08 +08:00
weizhihong
25413f0f58 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test 2022-04-24 13:03:03 +08:00
weizhihong
ce25b8458d 【草稿发布功能修改】 
【仿真数据加载逻辑修改】

Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-24 13:02:08 +08:00
joylink_zhangsai
19befb0909 修改大铁CTCbug 2022-04-24 11:12:37 +08:00
joylink_zhangsai
5e437a9751 Merge remote-tracking branch 'origin/test' into test 2022-04-22 19:27:52 +08:00
joylink_zhangsai
7cda8ad471 大铁CTC逻辑 2022-04-22 19:27:46 +08:00
weizhihong
9d7a9422d0 【指示灯状态逻辑】 
Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-22 19:27:33 +08:00
weizhihong
8abe421380 【改方按钮状态修改】 
Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-22 17:49:40 +08:00
weizhihong
b5bd2b4035 【去除多余操作指令，多余代码】 
【修改点灯操作与按钮亮灯操作一致】

Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-22 17:24:19 +08:00
weizhihong
83b92094c5 【增加邻站进路办理】 
【修改指示灯状态不变化BUG】

Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-22 15:37:51 +08:00
weizhihong
739ac78060 【邻站办理发车进路】 
Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-22 13:53:49 +08:00
weizhihong
d8425c80a5 Merge remote-tracking branch 'origin/test' into test 2022-04-22 13:51:32 +08:00
joylink_zhangsai
0c1e5f2268 大铁CTC逻辑（未完） 2022-04-22 13:47:39 +08:00
weizhihong
cbc42825f8 【修改改方逻辑问题】 
Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-22 10:05:01 +08:00
weizhihong
fedf7b2e3f 【处理区间灯关联区间信息】 
【仿真信息加载时，加入指示灯、按钮逻辑数据】
【增加指示灯、按钮状态变化消息实体】
【修改车站关联指示灯、按钮为空问题】
【增加指示灯类型过滤，减少循环】

Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-21 18:11:50 +08:00
weizhihong
abe24e0079 【刷新指示灯信息】BUG修复 
Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-21 12:15:48 +08:00
weizhihong
17edb388d8 【修改车站获取指示灯列表BUG】 
【增加按钮枚举类型】
【指示灯、按钮初始化类型筛选】

Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-21 11:06:11 +08:00
joylink_zhangsai
4cbb439634 消除大铁CTC线路仿真数据错误提示 2022-04-21 10:35:36 +08:00
joylink_zhangsai
3500e6a2fe 修改大铁进路数据（临时）处理接口 2022-04-21 09:23:13 +08:00
joylink_zhangsai
453c8a3eaa 修改进路构建逻辑 2022-04-20 18:47:21 +08:00
joylink_zhangsai
e26821c0eb Merge remote-tracking branch 'origin/test' into test 
# Conflicts:
#	src/main/java/club/joylink/rtss/simulation/cbtc/build/InterlockBuilder2.java
 2022-04-20 18:20:49 +08:00
joylink_zhangsai
a5f787c0f4 大铁进路生成逻辑修改；大铁CTC（未完） 2022-04-20 18:16:50 +08:00
weizhihong
1f85d75588 删除多余代码，修改【指示灯、按钮】初始化逻辑 
Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-20 16:37:07 +08:00
weizhihong
4a3e4d985a 【指示灯、操作按钮】初始化 
Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-20 15:31:45 +08:00
weizhihong
81c9ceb2aa 【指示灯信息】查询列表问题修复 
Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-20 11:10:13 +08:00
weizhihong
923db614cd 【指示灯、按钮】管理接口BUG修复 
Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-20 10:52:11 +08:00
weizhihong
2a14147c6a 【指示灯、按钮关联关系】管理接口 
Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-20 10:25:05 +08:00
joylink_zhangsai
61ba7c0e3d 运行图不检查有CTC系统（大铁）的线路的出入库交路 2022-04-19 17:47:35 +08:00
joylink_zhangsai
b65610a349 创建用户交路时根据地图配置决定检不检查线路基础数据 2022-04-19 16:59:35 +08:00
joylink_zhangsai
abfd140ae9 Merge remote-tracking branch 'origin/test' into test 2022-04-19 15:58:16 +08:00
joylink_zhangsai
e34852eb65 大铁进路路径生成逻辑修改 2022-04-19 15:58:00 +08:00
weizhihong
5c4bdf41dc 修改【指示灯关联实体类】 
Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-19 15:40:41 +08:00
weizhihong
23f738cbc1 增加【按钮与站台关联、指示灯与进路关联】 
Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-19 15:08:40 +08:00
weizhihong
56b099f39f 大铁【改方操作】【接发指示灯】功能 
Signed-off-by: weizhihong <weizhihong@joylink.club>
 2022-04-19 13:48:27 +08:00
joylink_zhangsai
b808c220a8 教学统计 2022-04-18 19:01:54 +08:00
joylink_zhangsai
6f0aa02eb6 大铁CTC（未完） 2022-04-18 14:48:20 +08:00
joylink_zhangsai
c65998e861 Merge remote-tracking branch 'origin/test' into dev 2022-04-18 14:35:46 +08:00
joylink_zhangsai
cb561da228 学生考试成绩曲线接口 2022-04-15 18:52:22 +08:00
joylink_zhangsai
48d3d6fb1d 大铁CTC 2022-04-15 18:51:26 +08:00
joylink_zhangsai
682beda268 处理大铁无ZC的问题：车站关联的zc没有用到，所以车站不再关联zc 2022-04-15 10:23:14 +08:00
joylink_zhangsai
78796a7009 修改佛山线运行图导入逻辑；修改ats准备发车时的逻辑 2022-03-31 10:22:20 +08:00
joylink_zhangsai
5c3a88d2aa 联动道岔、计轴关联道岔解锁逻辑修改 2022-03-30 17:32:19 +08:00
joylink_zhangsai
3aed0adf9d 修改EB距离计算逻辑 2022-03-30 15:59:13 +08:00
joylink_zhangsai
cfe37d824a 修改速度释放的逻辑；修改办理进路时检查延续保护道岔占用的逻辑 2022-03-29 16:51:08 +08:00
joylink_zhangsai
0e1a8da2d5 修改默认运行级别为ITC的线路加载出库列车的逻辑，使列车状态正确 2022-03-29 13:59:41 +08:00
joylink_zhangsai
c5e40e047c 修改佛山线运行图导入逻辑（调试车与运营车在不同的轨道折返）； 2022-03-28 14:57:40 +08:00
joylink_zhangsai
5d897e4925 修改佛山线运行图导入逻辑；修改无应答器线路itc移动授权更新逻辑 2022-03-25 18:44:06 +08:00
thesai
9f881edc6c 暂时提交 2022-01-24 23:24:55 +08:00
thesai
4e07a65b6a pa/pis系统消息类型作为操作参数 2022-01-19 14:36:13 +08:00
thesai
2e06dd9031 pis系统设备默认状态改为"正常" 2022-01-19 13:39:07 +08:00
thesai
3b9de34033 补充pa/pis系统设备状态 2022-01-18 17:44:41 +08:00
thesai
c9a504621b pa/pis系统功能 2022-01-18 15:54:29 +08:00
thesai
46dec55ba0 增加pa/pis系统数据接口；增加pa/pis系统交互逻辑（未完） 2022-01-17 14:34:51 +08:00
thesai
a3648eb642 项目域名查询时，未配置的域名不再尝试返回Default项目配置 2022-01-07 14:19:56 +08:00
thesai
9b781d3c12 Merge branch 'test' into dev 2022-01-05 17:16:15 +08:00
thesai
2de4d9b089 修改二维码url分割符；非测试/正式环境不生成二维码url；补充controller注释 2022-01-05 17:16:01 +08:00
sheng
af23df2ea5 修改服务和回调域名 2022-01-05 14:10:41 +08:00
thesai
d0813d027d 二维码生成带Project；项目域名配置里增加资源域名 2021-12-31 10:35:21 +08:00
thesai
7b4fad4939 修改查询运行中列车接口为仅查询【正线上的列车】 2021-12-30 16:49:10 +08:00
thesai
791a3d3fdf 增加构建考试规则后对总分的校验 2021-12-28 15:49:44 +08:00
thesai
ed00c8aa7f Merge remote-tracking branch 'origin/test' into dev 2021-12-28 11:50:17 +08:00
thesai
c00fbd22b3 删除数据处理接口，改用SQL处理数据 2021-12-28 11:49:37 +08:00
thesai
89f6f5ad4d 增加校验考试规则接口；增加重新生成系统考试规则接口；增加生成实训后自动校验考试并重新生成系统考试规则逻辑 2021-12-28 11:38:45 +08:00
sheng
cfe232769d 修改三维课程对象转换赋值bug 2021-12-27 09:12:04 +08:00
sheng
48a3b8c6cf 修改三维课程管理接口逻辑 2021-12-24 10:58:27 +08:00
sheng
5babfecb4c 添加三维课程相关管理接口 2021-12-24 10:43:55 +08:00
thesai
421d5c36c0 Merge remote-tracking branch 'origin/test' into dev 2021-12-23 17:48:16 +08:00
thesai
2c4e631b64 生成实训后检查考试规则是否符合要求；增加更改考试规则的接口 2021-12-23 17:45:06 +08:00
joylink_zhangsai
06cdf717b1 列车运行bug修改 2021-12-15 18:17:00 +08:00
joylink_zhangsai
31bf05101c 修改区段道岔失表时道岔区段占用显示异常的问题；修改区段故障的应用和修复逻辑的表述 2021-12-15 14:39:30 +08:00
joylink_zhangsai
d0a380156e Merge remote-tracking branch 'origin/test' into dev 2021-12-15 11:30:36 +08:00
joylink_zhangsai
9da6d14211 加载列车时，如果在站间，增加设置列车的到达、离站信息 2021-12-15 11:30:17 +08:00
Jade
bb851f3309 转换轨发车时间 2021-12-15 09:30:47 +08:00
joylink_zhangsai
d16909dd2c Merge remote-tracking branch 'origin/test' into dev 2021-12-14 17:47:14 +08:00
Jade
7047768aa9 屏蔽门故障只对非CTC进路有效 2021-12-14 17:42:08 +08:00
joylink_zhangsai
4d14cd19fd 【站台折返策略不生效】逻辑补全 2021-12-14 17:33:55 +08:00
Jade
8c7b9f6f89 isUpdateTripPlanByServiceNumber 2021-12-14 16:23:09 +08:00
joylink_zhangsai
4442223dfc 修改站台折返策略处理逻辑 2021-12-14 16:11:56 +08:00
joylink_zhangsai
82253f1832 Merge remote-tracking branch 'origin/test' into dev 2021-12-14 15:02:52 +08:00
joylink_zhangsai
f27b86b502 添加线路配置 2021-12-14 15:02:36 +08:00
Jade
17cade484f Merge remote-tracking branch 'origin/test' into test 2021-12-13 17:31:51 +08:00
Jade
11d9c2c421 车辆段逻辑 2021-12-13 17:31:44 +08:00
joylink_zhangsai
61fdd4941d 统一列车target更新逻辑 2021-12-13 17:29:14 +08:00
joylink_zhangsai
be92513d93 Merge remote-tracking branch 'origin/test' into dev 2021-12-13 11:22:11 +08:00
joylink_zhangsai
b8687f8d40 修改机器人驾驶识别信号机bug 2021-12-13 11:21:59 +08:00
Jade
6b7a36aeed 车辆段逻辑 2021-12-13 11:02:48 +08:00
joylink_zhangsai
690acdba5f 列车状态信息增加预选模式 2021-12-13 10:38:05 +08:00
joylink_zhangsai
46acce3f6b 处理福州线列车在二十一站左侧折返轨停车会导致提前更换车次问题；机器人驾驶增加识别信号机功能；处理车辆段的列车以备用车方式加载到正线上时因ctc移动授权丢失引起的问题； 2021-12-10 11:20:05 +08:00
joylink_zhangsai
306e91296a 运行图检查修改：当前后两车次分别是入库、出库时，无需前者的尾与后者的首相同 2021-12-10 10:03:51 +08:00
joylink_zhangsai
7dab924ae2 增加苏安院项目 2021-12-09 17:01:00 +08:00
joylink_zhangsai
f681f3a20f Merge remote-tracking branch 'origin/test' into dev 2021-12-09 16:33:36 +08:00
joylink_zhangsai
f8b2636355 延续保护区段允许选择逻辑区段 2021-12-09 16:33:19 +08:00
Jade
52821e1200 回库逻辑，加载备用车 2021-12-09 15:25:05 +08:00
xiazengbin
c6aa328d1d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server.git into test2-xzb-1 2021-12-09 14:39:29 +08:00
xiazengbin
3ebab8ed31 优化车辆段路径搜索 2021-12-09 14:29:24 +08:00
joylink_zhangsai
fd40f9de78 Merge remote-tracking branch 'origin/test' into dev 2021-12-09 13:25:44 +08:00
joylink_zhangsai
3577f7331b 增加【列车到达速度上限后牵引力与阻力持平】逻辑 2021-12-09 13:18:34 +08:00
Jade
0a52d4d029 显示配置-车次窗车头翻转 2021-12-09 10:28:13 +08:00
Jade
ce26b80e6a 车辆段 逻辑完善 2021-12-08 17:55:07 +08:00
joylink_zhangsai
edd6279e63 Merge branch 'test' into dev 2021-12-08 17:06:34 +08:00
joylink_zhangsai
e6f6421e50 Merge branch 'test' into test2 2021-12-08 17:06:08 +08:00
joylink_zhangsai
d557113276 修改【使用增加计划功能增加计划时，可能出现既是入库计划又是折返计划情况】的bug 2021-12-08 17:05:03 +08:00
Jade
c5eba208ff Merge remote-tracking branch 'origin/test2' into test2 2021-12-08 15:46:29 +08:00
Jade
1bf100f117 车辆段 出库逻辑 2021-12-08 15:46:03 +08:00
joylink_zhangsai
d9454dced0 Merge remote-tracking branch 'origin/test2' into test2 2021-12-08 15:41:23 +08:00
joylink_zhangsai
6372892cdb 修改重设车次号逻辑的位置以覆盖生成单条计划的情况 2021-12-08 15:41:11 +08:00
joylink_zhangsai
15f9f69428 增加线路配置【运行图中车次号唯一】（影响生成计划的车次号）与相应逻辑 2021-12-08 15:40:43 +08:00
joylink_zhangsai
13a11337dd 修改重设车次号逻辑的位置以覆盖生成单条计划的情况 2021-12-08 15:31:13 +08:00
joylink_zhangsai
7fcf48be35 增加线路配置【运行图中车次号唯一】（影响生成计划的车次号）与相应逻辑 2021-12-08 15:01:17 +08:00
Jade
88e5fa6abb 车辆段 派班计划生成调整 2021-12-08 13:05:44 +08:00
joylink_zhangsai
bed44dc77f Merge remote-tracking branch 'origin/test2' into test2 2021-12-08 11:01:14 +08:00
joylink_zhangsai
58cf6af8c7 修改ATS逻辑：【计划车到转换轨准备回库时自动转人工车】【有车辆段时回库列车不消失】 2021-12-08 11:01:06 +08:00
Jade
2cad9aea15 车辆段fix 2021-12-08 10:57:35 +08:00
Jade
549e1ef058 车辆段排列进路逻辑 2021-12-08 10:36:11 +08:00
Jade
4755d9a137 车辆段逻辑优化 2021-12-07 17:53:53 +08:00
Jade
087a603bc0 Merge remote-tracking branch 'origin/test2' into test2 2021-12-07 15:50:24 +08:00
Jade
645bfee559 车辆段逻辑 2021-12-07 15:50:10 +08:00
joylink_zhangsai
bc2451cc18 Merge remote-tracking branch 'origin/test2' into test2 2021-12-07 15:47:53 +08:00
joylink_zhangsai
2e09968362 修改ZC默认关联的区段筛选bug 2021-12-07 15:47:41 +08:00
xiazengbin
cae20aba53 车辆段加载route path 添加过滤 2021-12-07 15:26:50 +08:00
Jade
2433e7d813 车辆段逻辑 2021-12-07 11:27:48 +08:00
Jade
bac67b2ebf Merge remote-tracking branch 'origin/test2' into test2 2021-12-07 09:46:03 +08:00
xiazengbin
09b0f92614 优化loadDepotInOutRoutePath 2021-12-07 09:43:15 +08:00
xiazengbin
578d1fd44a 优化loadDepotInOutRoutePath 2021-12-07 09:38:44 +08:00
Jade
a834811cab Merge remote-tracking branch 'origin/test2' into test2 2021-12-07 09:24:25 +08:00
xiazengbin
b9a550a6a5 优化loadDepotInOutRoutePath 2021-12-07 09:12:32 +08:00
xiazengbin
76876c6818 Merge remote-tracking branch 'origin/test2' into test2-xzb 2021-12-06 18:18:45 +08:00
xiazengbin
eb56128954 SimulationBuilder.build中实现加载车辆段route path 2021-12-06 18:06:01 +08:00
Jade
7254a02356 车辆段逻辑 2021-12-06 16:15:12 +08:00
joylink_zhangsai
dbc3a62b7f Merge branch 'dev' into test2 2021-12-06 16:00:15 +08:00
joylink_zhangsai
ac1e32082c 【线路的ZC只有一个】且【ZC没有设置关联区段】时，自动关联全线计轴区段（以前是物理区段）；修改【区段有ZC在工作】的判定为【所属计轴区段有ZC在工作】 2021-12-06 15:52:14 +08:00
joylink_zhangsai
f5c711da90 修改岔心所在计轴区段预复位成功后，预复位状态未清除的bug 2021-12-06 13:22:48 +08:00
joylink_zhangsai
2258062e9a 列车经过【ARB】【进路锁闭】的区段之后，取消进路锁闭 2021-12-06 10:31:53 +08:00
Jade
05e0eedb34 列车加载到车辆段 2021-12-03 17:58:56 +08:00
joylink_zhangsai
d27df770d6 Merge remote-tracking branch 'origin/test' into dev 2021-12-02 13:00:20 +08:00
joylink_zhangsai
09d423a3f4 重启令解实训，背景给车站设置站控；列车经过【ARB】【进路锁闭】的区段之后，取消进路锁闭 2021-12-02 12:59:54 +08:00
Jade
be7e4f7a83 门选零位不给牵引力 2021-12-02 10:25:07 +08:00
joylink_zhangsai
a7acb9929d Merge remote-tracking branch 'origin/test' into dev 2021-12-01 18:29:49 +08:00
joylink_zhangsai
b054137647 生成实训时，用所属集中站过滤车辆段区段 2021-12-01 18:29:33 +08:00
Jade
2db15a49a4 岔心计轴故障逻辑 2021-12-01 18:28:10 +08:00
joylink_zhangsai
6fafb601d8 修改生成实训时，过滤车辆段区段的逻辑；区段状态增加remain 2021-12-01 14:09:44 +08:00
joylink_zhangsai
00ac703598 ci增加更新道岔预复位状态逻辑（因道岔计轴区段计轴故障预复位恢复后道岔的预复位状态没有清除掉）；增加【进路内区段有占用时，强解进路区段，延时解锁】；进路联锁条件不满足而延时解锁的道岔失表判定条件修改 2021-12-01 13:07:32 +08:00
joylink_zhangsai
5ea4b7af3e 项目域名管理接口修改；生成区段实训时，如果所属计轴区段属于车辆段，跳过 2021-11-30 16:28:53 +08:00
Jade
a5f30e905d 区段 岔心 2021-11-30 14:29:01 +08:00
Jade
d916dc162e 计轴受扰 岔心状态 2021-11-30 10:29:59 +08:00
Jade
63db1a8564 南京二 实训问题处理 岔心占用 2021-11-30 09:46:17 +08:00
joylink_zhangsai
a3d3f86518 Merge remote-tracking branch 'origin/test' into dev 2021-11-29 17:30:50 +08:00
joylink_zhangsai
6c5da045f7 连锁重启操作交出车站控制权 2021-11-29 17:30:30 +08:00
joylink_zhangsai
9839992d0c Merge branch 'master-huawei' into dev 2021-11-29 17:30:00 +08:00
Jade
8c59338df7 南京二 实训问题处理 2021-11-29 17:09:17 +08:00
Jade
dfcb558cf3 Merge remote-tracking branch 'origin/test' into test 2021-11-29 16:35:11 +08:00
Jade
4705b55aba 南京二 实训问题处理 2021-11-29 16:34:03 +08:00
joylink_zhangsai
aaf7582086 增加扬工院项目 2021-11-29 13:38:31 +08:00
thesai
fc6683c075 修改道岔故障（可恢复）枚举 2021-11-26 09:32:12 +08:00
thesai
bc2d84dfd0 Merge remote-tracking branch 'origin/test' into test 2021-11-26 09:25:58 +08:00
thesai
b7ea3007da 修改可恢复失表故障为1次恢复 2021-11-26 09:25:46 +08:00
Jade
cbd092b3c6 南京二 实训问题处理 岔心 2021-11-25 17:47:41 +08:00
thesai
b97969ab47 Merge remote-tracking branch 'origin/test' into test 2021-11-25 17:19:50 +08:00
thesai
53726f14fc 补全DeviceFault的注解 2021-11-25 17:19:40 +08:00
Jade
a9dfb2424a 南京二 实训问题处理 2021-11-25 14:53:57 +08:00
Jade
18533b2fbc 南京二 实训问题处理 - 替代信号机 2021-11-25 14:28:38 +08:00
thesai
5ac9c9ca41 Merge remote-tracking branch 'origin/test' into master-huawei 2021-11-25 12:10:47 +08:00
thesai
f7cb5fca15 仿真存储数据结构修改、补全 2021-11-25 10:06:00 +08:00
thesai
39ab1f9c0b 南京操作 2021-11-25 10:05:29 +08:00
Jade
68ebd521d8 南京二 实训问题处理 2021-11-24 10:46:07 +08:00
Jade
5130b67ddd 南京二 实训问题处理 2021-11-24 09:36:14 +08:00
Jade
002fca4c64 南京二 实训问题处理 2021-11-24 09:20:46 +08:00
Jade
8d540769cc 南京二 实训问题处理 2021-11-23 15:39:46 +08:00
Jade
b49aa0e807 南京二 实训问题处理 2021-11-23 10:28:45 +08:00
Jade
64e76d7bde 南京二 按计划行车问题 2021-11-22 16:43:39 +08:00
Jade
513aa73523 Merge remote-tracking branch 'origin/test' into test 
# Conflicts:
#	src/main/java/club/joylink/rtss/simulation/cbtc/data/CalculateService.java
 2021-11-22 11:21:43 +08:00
Jade
5169652845 南京二 按计划行车问题 2021-11-22 11:20:33 +08:00
thesai
6b16dc6fb4 删除查询进路路径方法中，虚拟信号机下的进路只有一条的断言和逻辑 2021-11-22 09:36:06 +08:00
thesai
247da90858 Merge remote-tracking branch 'origin/test' into master-huawei 2021-11-19 21:01:54 +08:00
walker-sheng
4ab64ffe1b 修改转辙机告警短信发送逻辑 2021-11-19 15:04:26 +08:00
thesai
cfc33cc649 Merge remote-tracking branch 'origin/test' into master-huawei 2021-11-18 18:59:52 +08:00
walker-sheng
fce534731a 添加用户登录信息清理逻辑 
修改在线用户信息查询接口bug
 2021-11-18 16:14:09 +08:00
walker-sheng
de74214d67 添加短信服务接口和转辙机发送短信告警信息功能 2021-11-18 14:33:36 +08:00
thesai
d21863effd 修改清除区段占用时，叉芯关联的物理区段占用状态未清除掉的bug 2021-11-17 12:02:24 +08:00
thesai
6dea82166e Merge remote-tracking branch 'origin/test' into test 2021-11-17 10:16:56 +08:00
thesai
54a7a5ea3d 修改包名Sr->sr 2021-11-17 10:16:42 +08:00
Jade
eaaf23720c 场景旧数据反序列化处理 2021-11-15 16:36:08 +08:00
thesai
65572dd3b0 Merge branch 'test' into master-huawei 2021-11-13 20:48:03 +08:00
Jade
ff4b3c1d51 获取可用区段位置计算区分是否真实设备 2021-11-12 14:55:53 +08:00
Jade
dccba0e918 场景3 道岔失表排列进路逻辑 2021-11-12 14:29:11 +08:00
Jade
582005279f 剧本故障操作 2021-11-12 14:28:11 +08:00
thesai
c3711f1ed0 上饶沙盘 2021-11-11 14:28:22 +08:00
Jade
93948956ab 仿真背景恢复-车次计划 2021-11-11 13:06:59 +08:00
Jade
36f9a3beee 头码车到站先回库 2021-11-10 13:13:38 +08:00
Jade
43bc7d04ce 剧本故障操作步骤处理 2021-11-09 10:51:34 +08:00
thesai
187d91ce08 增加转NRM模式指令；上饶增加控制列车功能 2021-11-08 16:50:16 +08:00
thesai
d9bab161d1 锁闭道岔的进路改为Set以避免同一进路多次添加 2021-11-08 14:44:32 +08:00
thesai
4b034565ed 上饶沙盘通用逻辑 2021-11-08 11:28:28 +08:00
thesai
2903520435 Merge remote-tracking branch 'origin/test' into test 2021-11-08 11:26:16 +08:00
thesai
dd78e5bd29 锁闭道岔的进路改为list 2021-11-08 11:26:04 +08:00
Jade
028d0b0bb4 Merge remote-tracking branch 'origin/test' into master-huawei 2021-11-04 18:17:14 +08:00
Jade
267003cd1a 接近锁闭进路配置逻辑调整 2021-11-04 17:31:44 +08:00
Jade
81e1aa081a 语音文件优化 2021-11-03 17:52:16 +08:00
Jade
a814c92060 调整剧本问题 2021-11-03 15:22:19 +08:00
Jade
561dabf098 优化enum判断 2021-11-02 14:00:05 +08:00
walker-sheng
a64c161845 Merge branch 'test' into master-huawei 2021-10-27 18:06:47 +08:00
thesai
4e7a87cf6b Merge remote-tracking branch 'origin/test' into test 2021-10-27 17:36:38 +08:00
thesai
9c7e710b62 修改实训扮演行值的逻辑 2021-10-27 17:36:16 +08:00
walker-sheng
7bb5c45e52 车站扣不住车bug修改 2021-10-27 17:29:40 +08:00
thesai
9fbffe7f84 Merge remote-tracking branch 'origin/test' into test 2021-10-27 16:43:06 +08:00
thesai
d6eddf138b 不生成车辆段、停车场里设备的实训；加载实训时根据定位设备code让成员扮演行值 2021-10-27 16:41:32 +08:00
joylink_zhangsai
aacca91bb8 Merge remote-tracking branch 'origin/test' into master-huawei 2021-10-26 18:46:42 +08:00
joylink_zhangsai
871287eb1c ibp盘关闭锁紧信号bug修改 2021-10-26 18:36:01 +08:00
joylink_zhangsai
89c23e50e3 修改道岔转动及控制权交出、接收bug 2021-10-25 16:05:35 +08:00
joylink_zhangsai
13506c2faa 修改，按计划行车时，列车前方进路中道岔不进路锁闭bug 2021-10-25 14:52:35 +08:00
joylink_zhangsai
b445b59290 上饶沙盘(除列车) 2021-10-22 18:06:02 +08:00
joylink_zhangsai
fd9a54f816 修改区段占用状态更新逻辑 2021-10-20 13:59:24 +08:00
joylink_zhangsai
e4891a7b8f 上饶沙盘（未完） 2021-10-15 18:18:35 +08:00
joylink_zhangsai
554246fa7d 修改地图数据校验 2021-10-15 18:17:55 +08:00
joylink_zhangsai
c319250093 修改福州实训问题 2021-10-14 14:30:12 +08:00
joylink_zhangsai
38848dbd14 修改义乌配置 2021-10-13 18:02:17 +08:00
joylink_zhangsai
cc822474f7 修改隔离模式默认状态 2021-10-13 14:49:09 +08:00
joylink_zhangsai
a828a2a03e 义乌iscs调整 2021-10-12 14:56:21 +08:00
joylink_zhangsai
7511b23764 Merge remote-tracking branch 'origin/test' into dev 2021-10-12 10:42:27 +08:00
joylink_zhangsai
e1b6675967 增加上饶沙盘项目、地图数据增加上饶沙盘设备编号 2021-10-12 10:42:03 +08:00
walker-sheng
4016623302 进路道岔解锁bug修改（A进路道岔解锁导致已经办理的B进路道岔被解锁） 2021-10-12 09:57:42 +08:00
walker-sheng
7e656054f3 按计划行车进路解锁逻辑bug修改 2021-10-11 18:25:56 +08:00
walker-sheng
b13944eeea 进路路径筛选进路逻辑调整 2021-10-11 17:01:01 +08:00
walker-sheng
dc80448b59 Merge remote-tracking branch 'origin/test' into test 2021-10-11 16:59:51 +08:00
walker-sheng
fc8f17cdb4 按计划行车办理进路、解锁进路逻辑调整 
进路路径筛选进路逻辑调整
直接办理进路道岔转动bug修改
 2021-10-11 16:59:33 +08:00
joylink_zhangsai
1d9ad4eeb8 地图显示配置增加参数 2021-10-11 15:22:11 +08:00
joylink_zhangsai
b9774a08fc 取消行车间隔调度生效逻辑 2021-10-11 15:16:30 +08:00
joylink_zhangsai
8553584150 南京列车调度-行车间隔调度 2021-10-11 14:43:57 +08:00
walker-sheng
55769ee2dc 删除无用代码和注解 2021-10-09 11:14:02 +08:00
joylink_zhangsai
765eae6f61 Merge remote-tracking branch 'origin/test' into dev 2021-10-08 15:53:35 +08:00
joylink_zhangsai
3364b096f5 修改按计划行车的进路办理、解锁逻辑 2021-10-08 15:53:18 +08:00
Jade
5cb7d7bac7 车辆段联锁生成调整 2021-09-29 17:36:42 +08:00
Jade
32b2bb7516 侧防code查询 2021-09-29 17:06:11 +08:00
joylink_zhangsai
ba091b3edf Merge remote-tracking branch 'origin/test' into master-huawei 2021-09-28 18:32:11 +08:00
joylink_zhangsai
3a52cbc4e4 Merge remote-tracking branch 'origin/test' into dev 2021-09-28 18:14:40 +08:00
joylink_zhangsai
8f43e51dba 列车运行级别升级需ma的atp防护速度为正；计轴故障区段不会再显示通信车占用 2021-09-28 18:14:28 +08:00
Jade
d48547959f 车辆段联锁生成-终端按钮 2021-09-28 17:23:46 +08:00
joylink_zhangsai
a345f73528 设备指令完成后将指令置为null（设置、取消屏蔽门无法关闭故障后，屏蔽门还是无法关闭） 2021-09-28 17:22:42 +08:00
joylink_zhangsai
ea64d61fa5 列车车头/车尾在计轴故障区段时无法升级至CBTC 2021-09-28 16:23:59 +08:00
joylink_zhangsai
1b6ffa0b8c 扣车状态不再影响更新列车target；ato开启条件减少 2021-09-28 16:14:46 +08:00
joylink_zhangsai
7ba23fb272 按计划行车时，<办理ats选择的进路>逻辑迁移 2021-09-28 15:26:10 +08:00
joylink_zhangsai
ec640aafc4 Merge remote-tracking branch 'origin/test' into dev 2021-09-28 15:17:19 +08:00
joylink_zhangsai
7e0bafc6db 按计划行车时，在构建列车监控处添加<通过ats为列车选择进路，并直接办理>逻辑 2021-09-28 15:17:10 +08:00
Jade
548564d146 车辆段联锁生成-终端按钮 2021-09-28 14:53:51 +08:00
Jade
7f6d9c863d 车辆段联锁生成-出段/进段信号机 2021-09-27 17:40:30 +08:00
joylink_zhangsai
6872f9b7bf 指令适配新的列车操作方式 2021-09-27 17:18:31 +08:00
joylink_zhangsai
f240238e56 Merge remote-tracking branch 'origin/test' into dev 2021-09-27 14:45:18 +08:00
joylink_zhangsai
2c5b139ff8 添加切换预选模式指令、移除切换驾驶模式指令 2021-09-27 14:45:10 +08:00
joylink_zhangsai
d7b5df2b3b 修改自动/联动开关门判定并添加机器人开关门逻辑 2021-09-27 14:43:23 +08:00
walker-sheng
d350d4fd6b Merge remote-tracking branch 'origin/test' into test 2021-09-27 10:41:56 +08:00
walker-sheng
28997a2b52 仿真数据构建添加信号机类型和型号校验 
联锁生成信号机型号不正确时抛出异常
 2021-09-27 10:41:43 +08:00
joylink_zhangsai
3ebfe664d5 列车预选模式降RM依然粉光带bug修改 2021-09-27 10:02:35 +08:00
joylink_zhangsai
316e43d697 Merge remote-tracking branch 'origin/test' into dev 2021-09-26 18:09:08 +08:00
joylink_zhangsai
a50ab163eb 发布地图导入导出修改 2021-09-26 18:08:59 +08:00
walker-sheng
e94772cff0 Merge remote-tracking branch 'origin/test' into test 2021-09-26 17:39:22 +08:00
walker-sheng
bc0a6c5757 显示数据添加修订设备位置相关属性 2021-09-26 17:39:09 +08:00
joylink_zhangsai
84344771c1 移动速度释放EB逻辑；注掉自动确认速度释放逻辑 2021-09-26 16:37:27 +08:00
joylink_zhangsai
b494fdfa6c Merge remote-tracking branch 'origin/test' into dev 2021-09-26 16:02:53 +08:00
joylink_zhangsai
3e9b4e677d 增加速度释放消息及相关逻辑 2021-09-26 16:02:42 +08:00
walker-sheng
7916b63df8 修改车站故障枚举及逻辑 
修改信号机故障枚举及逻辑
添加草稿地图信号机型号数据处理
 2021-09-26 15:44:28 +08:00
joylink_zhangsai
1a23bd4a82 【增加/修改】预选模式及相关逻辑 2021-09-24 18:38:58 +08:00
walker-sheng
fdee0acd77 显示数据添加修订设备位置相关属性 2021-09-24 16:52:47 +08:00
walker-sheng
4a70087c55 信号机添加显示方向字段 
添加发布数据处理
 2021-09-24 15:07:12 +08:00
walker-sheng
3ef10fe8e5 修改移动授权equals条件 2021-09-23 17:12:24 +08:00
walker-sheng
760dfb8ca7 Merge remote-tracking branch 'origin/test' into test 2021-09-23 14:37:37 +08:00
walker-sheng
8ceba6ac01 删除无用字段和配置 2021-09-23 14:37:27 +08:00
joylink_zhangsai
4ab1703e1c 删除无效引用 2021-09-22 17:06:10 +08:00
joylink_zhangsai
2b036ead91 Merge remote-tracking branch 'origin/test' into dev 2021-09-22 16:59:00 +08:00
joylink_zhangsai
2463a96204 真实IBP/PSL盘改为连接vrIBP/PSL（仅义乌项目） 2021-09-22 16:58:27 +08:00
walker-sheng
14735fb16e 联锁检查添加新屏蔽门故障检查判断 2021-09-22 15:34:36 +08:00
joylink_zhangsai
3cb47d9577 修改因加载IBP数据导致的地图绘制数据无法保存的bug 2021-09-22 14:12:58 +08:00
walker-sheng
1d60e2dd18 发送数据vo构建添加区段锁闭方向字段 2021-09-22 13:47:40 +08:00
walker-sheng
e6c3127261 处理按计划行车报错 2021-09-22 11:22:00 +08:00
joylink_zhangsai
8c9c952973 机器人逻辑报错修改 2021-09-22 11:11:15 +08:00
walker-sheng
1eb4bebb7a 添加信号机型号 
修改信号机是否开放信号判断逻辑
 2021-09-22 10:14:31 +08:00
walker-sheng
3410967ce6 Merge remote-tracking branch 'origin/test' into test 2021-09-18 17:37:07 +08:00
walker-sheng
ca6f5e01da 注销日志打印 2021-09-18 17:36:44 +08:00
walker-sheng
4594fe6784 处理ARB故障导致进路解锁bug导致的列车EB问题 2021-09-18 17:36:04 +08:00
joylink_zhangsai
dcdcf652d0 真实设备配置继承；义乌项目配置类重命名 2021-09-18 15:31:17 +08:00
joylink_zhangsai
8f47be4fe1 Merge remote-tracking branch 'origin/test' into dev 
# Conflicts:
#	src/main/java/club/joylink/rtss/simulation/cbtc/CI/device/CiStandService.java
 2021-09-18 14:38:31 +08:00
joylink_zhangsai
a2d0d1802f 修改虚拟PSL、IBP的加载时机；移除vrPsd中的屏蔽门控制级别相关字段，改为联锁实时根据vrPsl及vrIbp的状态判断 2021-09-18 14:36:29 +08:00
walker-sheng
56ba88d2cd 信号机封锁后不能开信号 
进路办理失败不取消锁闭
强制点灯操作修复
进路直接开放bug修改
 2021-09-18 13:51:30 +08:00
walker-sheng
b95af3b5b5 区段ARB预复位bug修改 2021-09-17 16:37:15 +08:00
walker-sheng
09e72d1e7e 联锁信号控制——联锁条件不满足，控制信号机显示禁止信号，联锁条件满足时自动开放信号 
信号机亮灯、灭灯控制改为联锁一直监控而非触发
修改道岔转动bug
 2021-09-17 15:21:32 +08:00
joylink_zhangsai
1dfba0b3e5 仿真任务只处理本仿真的内容 2021-09-17 13:14:11 +08:00
joylink_zhangsai
4f4040c772 Merge remote-tracking branch 'origin/test' into dev 
# Conflicts:
#	src/main/java/club/joylink/rtss/simulation/cbtc/CI/CiApiServiceImpl.java
#	src/main/java/club/joylink/rtss/simulation/cbtc/data/map/Switch.java
#	src/main/java/club/joylink/rtss/simulation/cbtc/data/vr/VirtualRealitySwitch.java
 2021-09-17 09:09:29 +08:00
walker-sheng
097b32b500 取消进路操作不能取消转换轨进路 
保护区段道岔锁闭位置不正确时不触发保护进路办理
修改延时解锁相关逻辑bug
 2021-09-16 18:07:06 +08:00
walker-sheng
7b287b9778 Merge remote-tracking branch 'origin/test' into test 2021-09-16 16:34:51 +08:00
walker-sheng
efe0f68043 延续保护进路解锁条件修改 2021-09-16 16:34:29 +08:00
Jade
a9e8b2d74d 车辆段联锁生成-构建进路 2021-09-16 15:52:46 +08:00
Jade
9ade3a2ba3 车辆段联锁生成-设置终端按钮信号机 2021-09-16 15:22:12 +08:00
walker-sheng
00d17860f9 添加屏蔽门故障导致进路信号降级逻辑 2021-09-16 15:14:37 +08:00
walker-sheng
849cfc59c3 添加进路延迟解锁逻辑 
修改取消进路逻辑
 2021-09-16 15:08:06 +08:00
walker-sheng
2432cb904d Merge remote-tracking branch 'origin/test' into test 2021-09-16 14:15:12 +08:00
walker-sheng
2e6cb76639 联锁系统逻辑完善 
信号机ctc下延续保护是否办理数据处理
 2021-09-16 14:14:55 +08:00
Jade
aff00f1f08 车辆段联锁生成 2021-09-16 11:28:58 +08:00
walker-sheng
1920204e33 虚拟真实设备初始化bug修改 2021-09-15 17:53:15 +08:00
walker-sheng
2f64748166 Merge remote-tracking branch 'origin/test' into test 2021-09-15 17:37:47 +08:00
walker-sheng
69aa300fed 联锁系统逻辑完善 2021-09-15 17:37:28 +08:00
walker-sheng
5362e24d92 联锁系统逻辑完善 
删除进路和延续保护的一些状态字段
 2021-09-15 17:21:55 +08:00
walker-sheng
1dcd1aec8a 添加清空用户草稿地图接口 2021-09-15 16:56:59 +08:00
walker-sheng
061ed998fd Merge remote-tracking branch 'origin/test' into ci-restruct 2021-09-15 11:00:36 +08:00
walker-sheng
9ed066a000 清理repository无用方法 2021-09-15 10:52:46 +08:00
Jade
a8d47ee567 车辆段联锁生成 2021-09-14 17:26:49 +08:00
walker-sheng
413e7e3969 Merge remote-tracking branch 'origin/test' into ci-restruct 
# Conflicts:
#	src/main/java/club/joylink/rtss/simulation/cbtc/CI/service/StandService.java
 2021-09-14 17:10:16 +08:00
walker-sheng
5664917d65 虚拟真实设备控制消息调整 
车辆段调度角色调整
 2021-09-14 17:09:15 +08:00
thesai
c2a00f26e9 修改小bug 2021-09-14 17:00:21 +08:00
walker-sheng
8bb4617a5f 添加无logo项目枚举 2021-09-14 14:20:22 +08:00
thesai
5753f54874 Merge remote-tracking branch 'origin/test' into test 2021-09-14 12:43:50 +08:00
thesai
884a93a8fe 修改义乌IBP盘配置 2021-09-14 12:43:33 +08:00
walker-sheng
b68db75959 Merge remote-tracking branch 'origin/test' into ci-restruct 2021-09-14 10:01:46 +08:00
walker-sheng
aea19447d8 Merge remote-tracking branch 'origin/test' into ci-restruct 
# Conflicts:
#	src/main/java/club/joylink/rtss/services/psl/VirtualRealityPslService.java
#	src/main/java/club/joylink/rtss/simulation/cbtc/CI/service/StandService.java
#	src/main/java/club/joylink/rtss/simulation/cbtc/data/vr/VirtualRealityScreenDoor.java
#	src/main/java/club/joylink/rtss/simulation/cbtc/device/real/modbustcp/heb/service/Heb1IbpServiceImpl.java
#	src/main/java/club/joylink/rtss/simulation/cbtc/device/real/modbustcp/heb/service/Heb1PslServiceImpl.java
 2021-09-14 10:01:10 +08:00
Jade
7bd5a25104 Merge remote-tracking branch 'origin/test' into test 2021-09-14 09:58:28 +08:00
Jade
dce425def9 车辆段联锁生成 2021-09-14 09:58:04 +08:00
thesai
9ab4d5a325 增加IBP、PSL、SIG控制屏蔽门的优先级逻辑；修改地图数据导入的bug 2021-09-13 19:14:42 +08:00
walker-sheng
947223dab7 Merge remote-tracking branch 'origin/ci-restruct' into ci-restruct 2021-09-13 09:13:55 +08:00
walker-sheng
7e3c5294fe Merge remote-tracking branch 'origin/test' into ci-restruct 2021-09-13 09:13:30 +08:00
walker-sheng
ce4eddfbdc 移动授权计算——未锁闭区段条件调整 
连锁逻辑调整
 2021-09-12 23:18:07 +08:00
thesai
c3a09a1b09 Merge remote-tracking branch 'origin/test' into test 2021-09-11 15:55:32 +08:00
thesai
3701b2df84 义乌项目真实设备联动 2021-09-11 15:55:16 +08:00
walker-sheng
b723ae88d1 Merge remote-tracking branch 'origin/test' into ci-restruct 2021-09-10 18:15:36 +08:00
walker-sheng
41613db7ee 联锁服务重写 
虚拟真实设备逻辑重构
 2021-09-10 18:15:15 +08:00
Jade
984c950da8 列车驾驶 ATO问题 2021-09-07 16:35:59 +08:00
Jade
1f9d75a28d 按计划行车列车数量 2021-09-07 15:49:07 +08:00
Jade
1a223feef6 司机驾驶 门模式、门选择 2021-09-07 15:06:12 +08:00
walker-sheng
4316ce03de Merge remote-tracking branch 'origin/test' into ci-restruct 2021-09-07 14:08:12 +08:00
Jade
430bc45881 司机驾驶 门模式、门选择 2021-09-07 14:03:53 +08:00
Jade
0fa5d54b7a Merge remote-tracking branch 'origin/test' into test 2021-09-07 09:33:06 +08:00
Jade
76dfa9911f delete unused 2021-09-07 09:12:48 +08:00
walker-sheng
3bc0ce321f Merge remote-tracking branch 'origin/test' into ci-restruct 2021-09-06 14:25:40 +08:00
walker-sheng
4c0ec909b0 添加工作站新类型：车辆段联锁工作站 
map数据显示控制数据添加工作站类型字段
 2021-09-06 14:24:22 +08:00
walker-sheng
178a289126 进路办理重写 2021-09-06 10:50:59 +08:00
walker-sheng
2cef80778a 先恢复旧字段相关逻辑（route和signal的） 2021-09-02 17:30:56 +08:00
walker-sheng
085f7ba632 Merge remote-tracking branch 'origin/test' into ci-restruct 2021-09-02 16:54:36 +08:00
walker-sheng
d5c2d5adfc Merge branch 'master-huawei' into test 2021-09-02 16:47:58 +08:00
walker-sheng
d5a446345c 添加中航锐创实训室项目枚举 
修改实训生成仿真重置bug（之前为三维改成控制方式重置导致）
 2021-09-02 16:33:10 +08:00
walker-sheng
7908d8c76b CI系统重构 2021-09-02 15:41:44 +08:00
Jade
d1d5e9780b move Point, delete unused 2021-09-01 14:15:57 +08:00
Jade
2ec3f74492 逻辑数据移到新包 2021-09-01 13:50:58 +08:00
Jade
40b1b9c34c 绘图数据移到新包 2021-09-01 13:40:53 +08:00
Jade
e3976b82f4 fix 人工车、头码车 早晚点状态 2021-08-31 18:03:26 +08:00
joylink_zhangsai
3ad5509840 修改道岔转动问题；增加列车调度操作 2021-08-30 18:11:54 +08:00
walker-sheng
05b61765f5 Merge remote-tracking branch 'origin/test' into ci-restruct 2021-08-30 17:22:06 +08:00
walker-sheng
5ae6ee8379 修改列车移动授权——反向锁闭区段作为移动授权终点bug修改 2021-08-30 17:20:38 +08:00
joylink_zhangsai
04be3cda30 Merge remote-tracking branch 'origin/test' into dev 2021-08-30 17:10:55 +08:00
walker-sheng
72c6ded4ec Merge remote-tracking branch 'origin/test' into test 2021-08-30 17:09:11 +08:00
walker-sheng
20f23b5468 修改列车移动授权——添加未锁闭区段作为移动授权终点逻辑 2021-08-30 17:08:56 +08:00
Jade
d76d9868af fix 信号封锁 2021-08-30 13:08:37 +08:00
Jade
9abcd2fc4f fix 人工车、头码车 早晚点状态 2021-08-30 11:11:24 +08:00
walker-sheng
dd79e61150 Merge remote-tracking branch 'origin/test' into ci-restruct 2021-08-27 18:13:48 +08:00
walker-sheng
1f63424ca1 信号机添加型号字段 
进路添加信号显示字段
添加上面两个字段地图数据处理
添加联锁信号机和道岔新的采集逻辑
添加可控制虚拟真实设备抽象，实现信号机和道岔控制逻辑
 2021-08-27 18:13:33 +08:00
joylink_zhangsai
09890ab2a1 Merge remote-tracking branch 'origin/test' into dev 
# Conflicts:
#	src/main/java/club/joylink/rtss/simulation/cbtc/ATS/operation/handler/TrainOperateHandler.java
 2021-08-27 15:09:15 +08:00
Jade
f838bd8ba3 南京2列车操作 2021-08-27 14:37:18 +08:00
joylink_zhangsai
b6a6bd1c89 修改获取仿真日志接口的实现；站台设置停站时间增加对列车设置停站时间功能 2021-08-26 16:11:41 +08:00
walker-sheng
f90c678ced 修改MA为延续保护信号机，延续保护为逻辑区段导致EB问题 2021-08-25 16:43:30 +08:00
joylink_zhangsai
c362c47fcd 修改运行图相关数据导入导出逻辑 2021-08-25 16:20:18 +08:00
joylink_zhangsai
f7f6b4d77a 新增：通信车无法通过有通信车占用故障的区段 2021-08-25 15:30:32 +08:00
joylink_zhangsai
d9ff56069c 对无计轴占用的区段使用计轴预复位，会导致ARB故障 2021-08-24 17:36:25 +08:00
joylink_zhangsai
0fdc83b33e 添加<进路默认开启冲突检测>配置及逻辑 2021-08-24 16:58:14 +08:00
joylink_zhangsai
6c3ac11caa 修改站台轨限速判定；人工车处理站台跳停；联锁数据生成时给计轴区段偏移量赋值 2021-08-24 14:06:29 +08:00
joylink_zhangsai
27e2f456fc 速度曲线限速逻辑重写 2021-08-24 13:07:49 +08:00
thesai
3fbef78cb4 速度曲线计算限速逻辑重写（未测试） 2021-08-23 22:26:37 +08:00
joylink_zhangsai
3f05a36687 速度曲线限速逻辑重写（未完） 2021-08-23 18:23:47 +08:00
joylink_zhangsai
e4df304b10 修改bug：通信车与非通信车占用区段未隔开 2021-08-23 14:32:26 +08:00
joylink_zhangsai
96ab9cd256 修改非通信车占用区段 2021-08-23 13:12:45 +08:00
joylink_zhangsai
2ef600d906 修改屏蔽门故障设置流程以使三维同步 2021-08-23 09:56:37 +08:00
joylink_zhangsai
1e31cd0971 取消站台轨默认限速；列车在计轴故障区域不恢复通信 2021-08-20 16:51:50 +08:00
joylink_zhangsai
00c12177e2 站台轨默认限速44；修改机器人驾驶CM列车bug；交人工控时自动取消冲突检测 2021-08-20 14:47:44 +08:00
joylink_zhangsai
9ddcdeb5fd 计划车到达最后一站时判断折返的条件修改 2021-08-20 11:22:58 +08:00
joylink_zhangsai
fc9dfe8a8d 修改psl盘开关门逻辑 2021-08-20 10:48:29 +08:00
joylink_zhangsai
7f3b8b2792 修改设置头码车时路径选择bug；修改驾驶模式相关 2021-08-19 18:47:50 +08:00
joylink_zhangsai
3ef2b12939 Merge remote-tracking branch 'origin/test' into dev 2021-08-19 18:09:37 +08:00
joylink_zhangsai
73b0de80da 列车接近导致信号机逻辑点灯时，关闭真实信号机；添加真实设备初始化时发送三维消息逻辑 2021-08-19 18:09:22 +08:00
walker-sheng
de5bc4c4f2 Merge remote-tracking branch 'origin/test' into ci-restruct 2021-08-19 18:08:15 +08:00
walker-sheng
ac59072e54 修改进路延续保护解锁后继续触发的bug 
修改ATP区段占用逻辑bug
修改区段通信车占用故障问题
 2021-08-19 18:08:01 +08:00
joylink_zhangsai
d668f21a1f Merge remote-tracking branch 'origin/test' into dev 2021-08-19 17:16:38 +08:00
walker-sheng
1a057918b3 进路办理检查：道岔锁闭位置检查 2021-08-19 17:07:02 +08:00
walker-sheng
29677120e3 修改车尾不确定位置为列车速度*2 2021-08-19 13:31:08 +08:00
joylink_zhangsai
368ff4bcd1 ats逻辑添加对站台折返策略的处理；修改折法进路办理逻辑； 2021-08-19 13:01:13 +08:00
walker-sheng
6317c12f12 修改道岔区段获取下一运行区段bug 2021-08-19 11:01:58 +08:00
walker-sheng
f66ef77efa 修改ATP占用问题 
修改按计划行车列车加载逻辑
 2021-08-19 10:34:36 +08:00
walker-sheng
f1cb974e8c 删除ATS无用文件 
修改ATP区段占用bug
 2021-08-19 10:20:00 +08:00
walker-sheng
41902a121b Merge remote-tracking branch 'origin/test' into ci-restruct 
# Conflicts:
#	src/main/java/club/joylink/rtss/simulation/cbtc/data/map/Section.java
#	src/main/java/club/joylink/rtss/simulation/cbtc/data/map/Switch.java
 2021-08-18 17:50:33 +08:00
walker-sheng
fe85608e25 进路办理添加道岔征用检查和征用道岔逻辑,延续保护征用修改为动态征用，即若其他进路征用在相反位置，则不断尝试征用，直至成功征用再开始办理延续保护 
列车扣车导致折返轨列车不发车问题修改
地面ATP清除区段占用bug修改
修改移动授权为前方列车时因eoa计算导致的后车EB问题
修改进路正常解锁特殊道岔征用未解锁导致的其他进路无法办理bug
联锁进路生成道岔筛选逻辑修改，同一计轴道岔的联动道岔也添加
 2021-08-18 17:45:24 +08:00
joylink_zhangsai
acd66b6268 根据南京二操作修改区故解逻辑； 2021-08-18 15:58:29 +08:00
joylink_zhangsai
7c6b2e47a8 Merge remote-tracking branch 'origin/test' into dev 
# Conflicts:
#	src/main/java/club/joylink/rtss/simulation/cbtc/ATP/ground/GroundAtpApiServiceImpl.java
 2021-08-18 13:30:22 +08:00
walker-sheng
31a25aeeb9 修改获取下一方向区段逻辑——根据系统采集的道岔位置 2021-08-18 09:05:55 +08:00
walker-sheng
4111b75d53 道岔区段查找下一运行区段逻辑bug修改 
ATP区段占用逻辑修改，不确定距离增加至30m，占用判断逻辑调整
出库列车加载bug修改
 2021-08-17 18:42:19 +08:00
walker-sheng
725fcef2fd 运行图校验修改 
仿真区段zc判断修改
 2021-08-17 11:29:50 +08:00
joylink_zhangsai
1c2c00b303 全站设置联锁自动触发开、关、ats自动进路开、关逻辑修改；接收控制权操作逻辑修改 2021-08-17 10:47:50 +08:00
joylink_zhangsai
197819a417 修改默认停站时间、运行等级校验 2021-08-16 17:43:51 +08:00
walker-sheng
8f80f34881 西安一号线周内周末运行图导入相关问题修改 2021-08-16 16:22:04 +08:00
joylink_zhangsai
fa4383cce6 通信车故障及恢复 2021-08-16 11:18:18 +08:00
walker-sheng
4a35fbca0f 修改CTC列车MA计算时机，修改非通信车ATP占用判断问题 2021-08-13 18:14:29 +08:00
walker-sheng
b1672f8abb 修改MA计算：EB触发安全长度改为20m，对于非通信车占用区段的EB触发距离计算改为到EOA距离 2021-08-13 15:07:33 +08:00
walker-sheng
7c77d328ad 修改ATS进路触发：信号机存在非ATS自动控制的进路就不再触发此信号机为始端的进路 2021-08-13 14:39:26 +08:00
joylink_zhangsai
2a7d83d198 修改头码车默认运行时间 2021-08-12 18:14:00 +08:00
joylink_zhangsai
d99901c568 修改头码车更新计划区段bug 2021-08-12 18:09:25 +08:00
joylink_zhangsai
5618276a3a 修改ats进路触发时间限制 2021-08-12 17:33:06 +08:00
joylink_zhangsai
d070ca7005 修改ats进路触发时间限制 2021-08-12 17:16:38 +08:00
joylink_zhangsai
39cefc32d5 增加郑州共赢测试项目；修改ats进路触发时间限制 2021-08-12 16:54:12 +08:00