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

2512 Commits

Author SHA1 Message Date
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
walker-sheng
f576023194 Merge remote-tracking branch 'origin/test' into ci-restruct 2021-08-12 15:09:27 +08:00
walker-sheng
6cd2d3bd2c MA非通信车占用区段eoa位置计算逻辑bug修改，MA计算迭代次数调整 
ITC移动授权计算添加atpOn条件
非CTC进路办理流程延续保护逻辑bug修改
 2021-08-12 15:09:11 +08:00
joylink_zhangsai
9bf2b2ded6 增加<回库>指令；非计划车不会自动回库；设置头码车时会清空ats待触发进路；设置头码车时会更新计划区段； 2021-08-12 15:04:49 +08:00
walker-sheng
8d217cfae1 MA计算逻辑修改，取移动授权距离最近的作为结束 
修改列车EB更新制动力问题
 2021-08-12 11:30:06 +08:00
joylink_zhangsai
2a6b0bebe1 修改设置计划车时更新车站计划的逻辑 2021-08-11 19:02:49 +08:00
joylink_zhangsai
3e4a0d1332 改为人工车时重置速度上线；进路排列时检查岔心 2021-08-11 18:27:48 +08:00
walker-sheng
2ad59b8f7c 处理列车更新目标区段问题 2021-08-11 18:13:15 +08:00
walker-sheng
8968d2c46d 列车更新目标区段bug修改 2021-08-11 17:18:33 +08:00
walker-sheng
42d1952ef4 提前发车操作逻辑修改 
列车更新目标区段添加限制
添加列车ato动车扣车检查
 2021-08-11 16:52:59 +08:00
joylink_zhangsai
c4cc217cd3 Merge remote-tracking branch 'origin/test' into dev 2021-08-11 14:56:35 +08:00
joylink_zhangsai
39bb108a64 修改生成默认课程bug；修改备用车设置为头码车不运行bug；未按计划行车时不再将转换轨的人工车替换成即将出库的计划车；修改<设置自动触发/ats自排时信号机需处于人工控>设置的判定bug；列车应用新计划时清除未触发的进路；修改列车更新目标区段逻辑； 2021-08-11 14:54:32 +08:00
walker-sheng
f3293c93d7 延续保护解锁侧防解锁逻辑问题修改 2021-08-11 11:20:54 +08:00
joylink_zhangsai
b431e382a5 修改设置计划车bug 2021-08-10 20:42:58 +08:00
joylink_zhangsai
ef79a3abf0 修改target更新逻辑；修改设置计划车bug；修改计轴故障时进路不能解锁问题 2021-08-10 20:24:48 +08:00
joylink_zhangsai
c557d118a6 修改头码车运行时仿真异常的问题（因为没有运行等级/停站时间数据，现在添加了对这两个数据的简单校验）；人工车有进路就能运行 2021-08-10 16:09:10 +08:00
joylink_zhangsai
b86308f88a 取消应答器数据校验 2021-08-10 13:16:47 +08:00
joylink_zhangsai
c7b63cfacc 地图发布创建默认交路时，数据检查不通过时，不再报错，仅取消创建交路 2021-08-10 10:11:09 +08:00
joylink_zhangsai
9e39ee5a93 Merge remote-tracking branch 'origin/test' into dev 2021-08-09 16:46:20 +08:00
joylink_zhangsai
44d3166858 修改进路触发逻辑；列车在转换轨停车时，增加检查回库的逻辑 2021-08-09 16:46:05 +08:00
walker-sheng
631324c2c7 ato逻辑无速度曲线判断 2021-08-09 14:45:55 +08:00
walker-sheng
bdd35ae336 Merge remote-tracking branch 'origin/test' into ats-restruct 
# Conflicts:
#	src/main/java/club/joylink/rtss/simulation/cbtc/onboard/ATO/service/ATOService.java
#	src/main/java/club/joylink/rtss/simulation/cbtc/onboard/ATP/ATPLogicLoop.java
 2021-08-09 14:35:23 +08:00
walker-sheng
884b312623 列车ITC级别运行相关逻辑完善 2021-08-09 14:28:07 +08:00
joylink_zhangsai
05d585e37e 修改进路筛选bug；修改ma计算bug；修改ats监控列车的通信判定 2021-08-09 13:59:04 +08:00
walker-sheng
38da1d716c 列车ITC级别运行相关逻辑实现 2021-08-06 18:12:54 +08:00
joylink_zhangsai
6f76ea4df7 处理无折返策略数据导致的bug 2021-08-06 18:00:52 +08:00
joylink_zhangsai
6cadfcf607 hmi消息增加牵引/制动力比例 2021-08-06 16:32:33 +08:00
joylink_zhangsai
6dee8dfa31 多点登录被登出后发送socket消息；ARB故障在有非通信车接近时改为计轴故障 2021-08-06 14:21:03 +08:00
joylink_zhangsai
3607e9ebe2 进路设置自动通过后，无法使用取消进路操作；从发布地图创建草稿增加超限区段数据 2021-08-06 10:22:47 +08:00
joylink_zhangsai
5c2a94161a bug 2021-08-05 18:49:48 +08:00
joylink_zhangsai
afbaf5debc Merge remote-tracking branch 'origin/ats-restruct' into ats-restruct 2021-08-05 18:38:14 +08:00
joylink_zhangsai
5570eac3e4 进路超限区段数据构建，逻辑实现 2021-08-05 18:37:55 +08:00
walker-sheng
3af6b866ab Merge remote-tracking branch 'origin/ats-restruct' into ats-restruct 2021-08-05 17:41:02 +08:00
walker-sheng
405b2368f9 列车终点站跳停逻辑修改 2021-08-05 17:40:39 +08:00
joylink_zhangsai
534c014bb1 修改ATO逻辑；增加处理地图草稿数据接口 2021-08-05 16:18:26 +08:00
joylink_zhangsai
3e16198215 修改新版ma计算；恢复ATO到站自动开门后关闭ATO逻辑 2021-08-05 13:48:46 +08:00
joylink_zhangsai
43274b5511 修改扣车bug 2021-08-05 10:03:07 +08:00
joylink_zhangsai
334d4ec105 增加创建超限区段接口、进路数据关联超限区段 2021-08-05 09:52:47 +08:00
joylink_zhangsai
8e58d6ba89 设置头码车路径寻找逻辑修改 2021-08-05 09:51:35 +08:00
joylink_zhangsai
3d712e6486 修改新ATS中的bug；取消进路功能不再取消自动通过状态 2021-08-04 18:02:36 +08:00
joylink_zhangsai
e0c7ad2150 Merge remote-tracking branch 'origin/ats-restruct' into ats-restruct 2021-08-04 15:16:20 +08:00
joylink_zhangsai
d6ba9cd5cf 取消进路功能不能取消通过进路 2021-08-04 15:12:05 +08:00
walker-sheng
77459e2a98 列车跳停bug修改 2021-08-04 09:37:12 +08:00
walker-sheng
1f6b77b26a MA计算ato距离逻辑调整 2021-08-03 18:34:13 +08:00
joylink_zhangsai
a3634dda76 新版ATS进路选择bug修改；头码车计划区段更新逻辑修改； 2021-08-03 16:58:24 +08:00
joylink_zhangsai
eb5d355485 Merge remote-tracking branch 'origin/ats-restruct' into ats-restruct 2021-08-03 15:47:02 +08:00
walker-sheng
83f5ada9f3 仿真ats重构-修改服务端口 2021-08-03 14:13:19 +08:00
joylink_zhangsai
c825bd92aa Merge remote-tracking branch 'origin/test' into ats-restruct 2021-08-03 13:59:01 +08:00
joylink_zhangsai
0296d007ab 设置人工车时，列车在停止状态下才清除target；添加创建进路接口；列车最大速度降低至80km/h 2021-08-03 13:58:39 +08:00
walker-sheng
653a29eb65 仿真ats重构-MA移动授权逻辑重构，ATS进路触发逻辑调整，进路正常开始解锁逻辑判断流程调整（现根据进路第一区段占用情况触发） 2021-08-03 13:53:49 +08:00
joylink_zhangsai
670ed1163a 新版ATS进路选择修改 2021-08-02 16:22:08 +08:00
joylink_zhangsai
6840372770 区段计轴故障流程修改；设置互锁解除时重开信号机 2021-08-02 11:22:05 +08:00
joylink_zhangsai
f0bd183765 Merge remote-tracking branch 'origin/test' into ats-restruct 
# Conflicts:
#	src/main/java/club/joylink/rtss/simulation/cbtc/ATP/ground/ZCLogicLoop.java
#	src/main/java/club/joylink/rtss/simulation/cbtc/onboard/ATP/ATPLogicLoop.java
#	src/main/java/club/joylink/rtss/simulation/cbtc/onboard/ATP/ATPService.java
 2021-08-02 09:48:34 +08:00
joylink_zhangsai
0a989ab9e2 新版ATS进路选择修改 2021-08-02 09:40:52 +08:00
thesai
8fc7e34e65 防护速度改为推荐速度+5km/h 2021-08-01 19:41:32 +08:00
joylink_zhangsai
6f0a60a3ea hmi添加字段；计算速度曲线逻辑迁移至ATP循环；ATP速度防护逻辑修改 2021-07-30 19:06:45 +08:00
joylink_zhangsai
833d2ecb6e 列车进站停车开门后关闭ATO；非通信车开关车门不联动站台门；列车三维状态数据增加字段 2021-07-30 16:59:14 +08:00
joylink_zhangsai
6d7bb118ae 修改进路区段限速判断 2021-07-29 17:31:32 +08:00
joylink_zhangsai
1fd9d1230c 添加逻辑：为非通信车办理的进路，如果有区段限速，信号无法开启 2021-07-29 16:55:19 +08:00
joylink_zhangsai
f4a5037de3 Merge remote-tracking branch 'origin/test' into dev 2021-07-29 15:20:00 +08:00
joylink_zhangsai
988bed827d 修改备用车无法ATO驾驶（zc去掉未锁闭进路检查）、不停站问题 2021-07-29 15:19:51 +08:00
joylink_zhangsai
f078ad99dd 修改移动授权对非通信车占用的判定；修改驾驶模式切换bug 2021-07-29 14:05:09 +08:00
walker-sheng
456897fd78 仿真抽象——仿真运行逻辑控制不同步执行bug修改 2021-07-29 13:33:46 +08:00
joylink_zhangsai
d6011b5395 修改移动授权对非通信车占用的判定；修改切SM驾驶模式bug 2021-07-29 10:11:45 +08:00
joylink_zhangsai
0a7b17bee2 修改列车驾驶模式切换、区段占用判断、移动授权计算逻辑 2021-07-28 18:05:57 +08:00
joylink_zhangsai
da58bce36c 现地显示配置增加字段 2021-07-28 17:00:34 +08:00
joylink_zhangsai
55251a833e 小bug 2021-07-27 18:10:28 +08:00
joylink_zhangsai
eaabfd124e 修改屏蔽门相关psl盘状态、ats状态、移动授权计算 2021-07-27 18:01:55 +08:00
joylink_zhangsai
bbd36ea889 修改非CTC进路的联锁检查逻辑 2021-07-27 17:41:23 +08:00
joylink_zhangsai
239c3c9f08 修改<越红灯><确认运行至前方站>指令对驾驶模式的限制 2021-07-27 14:20:36 +08:00
joylink_zhangsai
4d3e7b8735 Merge remote-tracking branch 'origin/test' into ats-restruct 2021-07-27 14:12:07 +08:00
joylink_zhangsai
148baa1b4f Merge remote-tracking branch 'origin/test' into ats-restruct 2021-07-27 14:06:20 +08:00
joylink_zhangsai
ed421e0650 新增：转CM前更新CBTC移动授权； 
修改：CBTC移动授权对车头区段非通信车占用的判定
 2021-07-27 13:50:46 +08:00
joylink_zhangsai
4438009ccd 移除EB时不能开启ATO的逻辑；移除EB且未停车时不更新ma的逻辑 2021-07-27 10:09:31 +08:00
joylink_zhangsai
fdf1638e73 添加<突然EB>故障；RM模式不丢失定位 2021-07-26 18:23:05 +08:00
joylink_zhangsai
ca1a13c715 Merge remote-tracking branch 'origin/ats-restruct' into ats-restruct 2021-07-26 14:09:07 +08:00
joylink_zhangsai
b4776ffaa3 修改新版ATS进路排列逻辑 2021-07-26 14:08:52 +08:00
joylink_zhangsai
63da590542 修改停站流程 2021-07-26 10:55:47 +08:00
walker-sheng
7141285039 仿真ats重构-ats触发进路不触发存在联锁自动触发或联锁自动进路的始端信号机 2021-07-23 16:10:09 +08:00
walker-sheng
8059408d96 仿真ats重构-添加为列车更新目的区段逻辑，修改计划车折返进路办理bug，修改信号机接近区段判断bug，添加进路非ATS自动控相关逻辑 2021-07-23 14:57:07 +08:00
joylink_zhangsai
02924c0cb5 Merge remote-tracking branch 'origin/ats-restruct' into ats-restruct 2021-07-23 11:09:12 +08:00
joylink_zhangsai
0f23c27b3b 修改列车停站处理逻辑 2021-07-23 11:08:57 +08:00
walker-sheng
450c33ea74 仿真ats重构-进路冲突检查字段回传 2021-07-23 09:29:12 +08:00
walker-sheng
edb3a43cb5 仿真ats重构-ATS进路冲突检查逻辑调整，进路冲突处理流程完善 2021-07-22 17:36:16 +08:00
walker-sheng
b94f90ce17 仿真ats重构-ATS进路冲突检查流程开发（告警方式实现） 2021-07-21 15:40:06 +08:00
joylink_zhangsai
4ea0ad5e1f 修改：新版头码车进路办理bug 2021-07-21 11:17:58 +08:00
joylink_zhangsai
b37cc7d631 修改：非通信车停站站台设置扣车不再关闭信号机 2021-07-20 17:30:48 +08:00
walker-sheng
0bb8289352 Merge remote-tracking branch 'origin/test' into simulation-new-logic 2021-07-20 16:43:57 +08:00
walker-sheng
46b9a06299 添加电路草稿相关数据管理接口 
修改区段进路解锁方法参数和逻辑
 2021-07-20 16:43:41 +08:00
joylink_zhangsai
bef8add983 修改：道岔区段故障占用时进路仍能办理的bug 2021-07-20 16:02:27 +08:00
joylink_zhangsai
6afa297947 修改：回滚配置文件 2021-07-20 15:24:31 +08:00
joylink_zhangsai
ec0b05323c 修改：进路区段故障占用时无法办理 
修改：删除扣车批量操作bug
 2021-07-20 15:14:41 +08:00
walker-sheng
f8a42de456 仿真ats重构-ATS触发列车进路办理添加进路中调头列车检查逻辑，触发进路问题修改，ZC锁闭进路逻辑重新打开 2021-07-20 14:49:51 +08:00
joylink_zhangsai
bc5b95df5f 修改：进路延续保护在CTC模式下是否需要办理作为数据 2021-07-20 13:52:05 +08:00
walker-sheng
1ae1ab6a27 Merge remote-tracking branch 'origin/test' into ats-restruct 2021-07-19 16:44:57 +08:00
joylink_zhangsai
a7e98da3af 修改：前方列车移动授权计算bug 
修改：修改进路锁闭移动授权判定逻辑（为了让列车调头后前方进路未排列时不动车）
修改：进路办理失败时不从settingRouteMap移除（西安三问题）
 2021-07-19 16:39:17 +08:00
walker-sheng
9df1c00929 仿真ats重构-ATS触发计划车进路逻辑修改（计划时间前50s才选进路），添加冲突检测相关状态和逻辑 2021-07-19 16:01:09 +08:00
joylink_zhangsai
f1451d1f12 新增：进路数据处理接口（standHoldList） 2021-07-19 13:11:52 +08:00
joylink_zhangsai
6c1c8d1b43 修改：进路办理检查内容（自动进路） 
新增：<进路联锁不包含站台扣车>联锁配置及相关逻辑
 2021-07-19 11:11:41 +08:00
walker-sheng
0f141664f1 Merge remote-tracking branch 'origin/test' into ats-restruct 
# Conflicts:
#	src/main/java/club/joylink/rtss/simulation/cbtc/onboard/ATP/ATPLogicLoop.java
 2021-07-19 09:42:55 +08:00
walker-sheng
d68d836aa5 Merge remote-tracking branch 'origin/ats-restruct' into ats-restruct 2021-07-19 09:40:59 +08:00
thesai
f70c7a51c6 修改：移动授权计算bug 2021-07-16 22:49:26 +08:00
thesai
321b4d2b4c 修改：前方列车移动授权计算bug 2021-07-16 21:57:42 +08:00
joylink_zhangsai
2793d56431 新版头码车逻辑修改（未完） 2021-07-16 18:26:01 +08:00
joylink_zhangsai
08068ebf21 修改：ma为null导致的bug 2021-07-16 17:12:06 +08:00
joylink_zhangsai
ce176c1035 回滚：添加计划接口 2021-07-16 17:05:43 +08:00
joylink_zhangsai
288dc92579 新增：<无关闭锁紧信号>故障 2021-07-16 16:43:41 +08:00
joylink_zhangsai
8df4df4c0f 修改：扣车不再影响站台/列车正常关门 2021-07-16 11:17:22 +08:00
joylink_zhangsai
341a8a92bb 修改：设置联锁自动触发不再关闭进路自动控（ats进路自动触发逻辑对应修改） 2021-07-16 11:16:43 +08:00
joylink_zhangsai
86dce84b28 修改：移动授权计算bug 2021-07-16 09:15:19 +08:00
walker-sheng
8e06b39322 Merge remote-tracking branch 'origin/test' into ats-restruct 2021-07-15 16:37:14 +08:00
joylink_zhangsai
645a06cec4 Merge remote-tracking branch 'origin/test' into dev 2021-07-15 16:35:18 +08:00
joylink_zhangsai
2ea4672f00 修改：移动授权计算bug 2021-07-15 16:35:09 +08:00
walker-sheng
921358002c Merge remote-tracking branch 'origin/test' into ats-restruct 2021-07-15 16:29:48 +08:00
walker-sheng
2d4b40cdb5 仿真ats重构-修改车载更新下一计划接口，修改区段进路解锁和延续保护解锁锁闭方向bug，修改CI运行频率为1s 2021-07-15 15:03:45 +08:00
walker-sheng
2b61795f09 仿真ats重构-修改进路排列bug，修改获取下一车次计划bug，修改停站时间判断bug 2021-07-15 14:07:12 +08:00
walker-sheng
7eb15b6ad8 添加2d模型历史版本分页查询接口 2021-07-15 10:56:47 +08:00
walker-sheng
8ba8d915dc Merge remote-tracking branch 'origin/test' into simulation-new-logic 2021-07-15 09:56:13 +08:00
walker-sheng
d5f0672a57 添加郑州共赢小程序配置和登录接口等 
添加2d模型历史版本相关接口
 2021-07-15 09:55:55 +08:00
joylink_zhangsai
9aa9dc6035 头码车逻辑 2021-07-15 09:55:40 +08:00
joylink_zhangsai
f629002d95 新增：显示配置 2021-07-14 09:37:08 +08:00
walker-sheng
d8426a5d2d 仿真ats重构-列车车载站台逻辑控制bug修改，移动授权距离调整，进路路径区段排序构建bug修改，ATS计划车冲突判断bug修改，计划车更新车次计划未同步到列车车载bug修改 2021-07-13 18:21:37 +08:00
walker-sheng
9e7148525b 仿真ats重构-进路区段解锁逻辑修改 2021-07-13 15:42:46 +08:00
walker-sheng
cea1f6de3b Merge remote-tracking branch 'origin/test' into ats-restruct 2021-07-13 15:05:17 +08:00
joylink_zhangsai
1b5a6cc68e 修改：前方列车的移动授权计算 2021-07-13 14:58:15 +08:00
walker-sheng
cecfcb1f57 Merge remote-tracking branch 'origin/test' into ats-restruct 2021-07-13 13:32:56 +08:00
joylink_zhangsai
9a25867812 修改：移动授权计算 2021-07-13 13:01:51 +08:00
walker-sheng
064f64a1ee 仿真ats重构-ATS计划车进路触发逻辑调整 2021-07-13 11:05:38 +08:00
walker-sheng
8612c012a9 Merge remote-tracking branch 'origin/test' into ats-restruct 2021-07-13 10:49:36 +08:00
joylink_zhangsai
5b1603cca4 修改：移动授权计算 2021-07-13 10:32:33 +08:00
walker-sheng
84a47d6183 Merge remote-tracking branch 'origin/test' into ats-restruct 2021-07-12 17:25:26 +08:00
walker-sheng
d78c1db2d8 仿真ats重构 2021-07-12 17:25:17 +08:00
joylink_zhangsai
792263361e 修改：道岔进路/延续保护锁闭并失表时才计算移动授权 2021-07-12 17:11:50 +08:00
joylink_zhangsai
5d61e74415 IBP盘bug修改 2021-07-12 14:30:30 +08:00
joylink_zhangsai
a48e863898 Merge remote-tracking branch 'origin/test' into dev 2021-07-09 10:45:52 +08:00
walker-sheng
94105ddd88 Merge remote-tracking branch 'origin/test' into simulation-ATS-restruct 2021-07-08 17:46:33 +08:00
walker-sheng
afa4228e94 仿真ats重构 2021-07-08 17:46:13 +08:00
walker-sheng
30fcdeab8f Merge remote-tracking branch 'origin/test' into simulation-new-logic 2021-07-08 15:38:03 +08:00
walker-sheng
9105e2cb44 调试修改2d模型操作相关接口 
修改仿真记录bug
修改第三方同步问题
 2021-07-08 15:37:40 +08:00
joylink_zhangsai
6137c977bc 修改：开关门指令无效bug 2021-07-08 15:07:53 +08:00
joylink_zhangsai
8faf1c9886 新增：IBP盘关门按钮；PSL盘关闭且紧锁指示灯 2021-07-08 14:44:18 +08:00
walker-sheng
6a91cfe698 Merge remote-tracking branch 'origin/test' into simulation-ATS-restruct 2021-07-07 18:07:52 +08:00
joylink_zhangsai
cec67bc20b 修改：设置头码车时的车次校验 2021-07-07 18:03:19 +08:00
walker-sheng
8daaf8743d Merge remote-tracking branch 'origin/test' into simulation-ATS-restruct 2021-07-07 17:43:11 +08:00
joylink_zhangsai
65066fe38f 修改：道岔相关移动授权计算 2021-07-07 16:24:37 +08:00
walker-sheng
d76f37c2b0 Merge remote-tracking branch 'origin/test' into simulation-ATS-restruct 2021-07-07 15:21:20 +08:00
joylink_zhangsai
85091f8af6 修改：IBP盘试灯按钮逻辑修改 2021-07-07 11:07:00 +08:00
joylink_zhangsai
4a39c9bf89 修改：进路相关移动授权计算bug 2021-07-07 11:02:22 +08:00
walker-sheng
1948322d80 Merge remote-tracking branch 'origin/test' into simulation-ATS-restruct 
# Conflicts:
#	src/main/java/club/joylink/rtss/simulation/cbtc/data/vo/TrainInfo.java
 2021-07-07 10:34:31 +08:00
joylink_zhangsai
679b5012b3 修改：进路相关移动授权计算 2021-07-07 09:52:51 +08:00
joylink_zhangsai
6edd259ca7 修改：ATO及机器人驾驶逻辑 2021-07-06 17:52:50 +08:00
joylink_zhangsai
910f7a359b 修改：进路相关移动授权计算 2021-07-06 15:52:33 +08:00
joylink_zhangsai
73b34bca1d 修改：设置人工车逻辑；ATO运行逻辑 2021-07-06 15:10:48 +08:00
joylink_zhangsai
92c572fad4 修改：运行图初始化bug 2021-07-06 11:28:43 +08:00
walker-sheng
e98bb1a9b7 Merge remote-tracking branch 'origin/test' into simulation-ATS-restruct 2021-07-06 11:18:21 +08:00
joylink_zhangsai
2ddb1c38c5 修改：有关进路的移动授权计算逻辑bug 2021-07-06 11:13:56 +08:00
joylink_zhangsai
5bb62daef0 修改：头码车进路选择逻辑 2021-07-06 09:51:26 +08:00
joylink_zhangsai
34118c2732 Merge remote-tracking branch 'origin/test' into dev 2021-07-06 09:26:58 +08:00
joylink_zhangsai
bfb41bc0bb 新增：加线抽线的初始化逻辑；查询车次计划时过滤掉删除的计划 2021-07-06 09:26:45 +08:00
joylink_zhangsai
f25c5fd5f1 修改：换端操作不再关闭ATO；进路相关移动授权计算 2021-07-06 09:24:59 +08:00
joylink_zhangsai
35d6139ed6 新增：头码车到终点变人工车（线路配置） 2021-07-05 17:41:22 +08:00
joylink_zhangsai
8099ee57e9 修改：非通信车占用判定 2021-07-05 17:12:53 +08:00
joylink_zhangsai
2781568f82 修改：非通信车占用判定bug 2021-07-05 16:55:17 +08:00
joylink_zhangsai
b0bfe7bcc3 新增：登录增加参数（成工业） 2021-07-05 16:18:02 +08:00
joylink_zhangsai
a93df56e55 新增：进路排列增加道岔占用检查 2021-07-05 16:15:33 +08:00
joylink_zhangsai
343ce12cea 修改：计轴故障bug 2021-07-05 16:14:38 +08:00
walker-sheng
b4b5be759f 修改仿真仓库运行图空指针bug 2021-07-05 15:30:56 +08:00
joylink_zhangsai
889f45fe40 新增：列车所在进路道岔位置不正确会导致EB 2021-07-05 13:16:35 +08:00
walker-sheng
9b62d12915 Merge remote-tracking branch 'origin/test' into simulation-ATS-restruct 
# Conflicts:
#	src/main/java/club/joylink/rtss/simulation/cbtc/ATS/AtsApiServiceImpl.java
#	src/main/java/club/joylink/rtss/simulation/cbtc/build/RunPlanBuilder.java
#	src/main/java/club/joylink/rtss/simulation/cbtc/data/SimulationDataRepository.java
 2021-07-02 18:49:19 +08:00
walker-sheng
ee1afdb699 仿真ats重构 2021-07-02 18:47:53 +08:00
joylink_zhangsai
9468e2848b 新增：运行图加线、抽线功能（西铁院） 2021-07-02 13:40:26 +08:00
joylink_zhangsai
517f6bb536 新增：信号机延续保护状态（前端信号机编号显示蓝色）（西安三53） 2021-07-02 13:26:02 +08:00
joylink_zhangsai
39c8eab5c2 新增：线路配置<转换轨进路只能通过区故解取消>（西安三52） 2021-07-02 11:18:57 +08:00
joylink_zhangsai
d335982687 修改：延续保护解锁逻辑（西安三49） 2021-07-02 09:18:17 +08:00
joylink_zhangsai
7119fad066 修改：列车升降级逻辑（因取消通信故障后会直接升级CBTC） 2021-07-01 17:20:33 +08:00
joylink_zhangsai
d83a076f14 修改：ARB故障逻辑 2021-07-01 15:27:59 +08:00
joylink_zhangsai
6c6da7560d 修改：列车信息更新折返策略报错bug 2021-06-30 18:05:09 +08:00
joylink_zhangsai
8d74fe84b1 修改：IBP盘试灯按钮bug 2021-06-30 17:27:45 +08:00
joylink_zhangsai
9e88dcef49 新增：列车加载时更新折返策略和折返状态 2021-06-30 17:11:30 +08:00
joylink_zhangsai
ebc45fdfee 新增：线路配置<设置头码车时检查方向>及逻辑 2021-06-30 17:10:39 +08:00
joylink_zhangsai
ffbb75ea4d 新增：StandStatus增加折返策略 2021-06-30 15:18:54 +08:00
joylink_zhangsai
18fbefcee7 修改：列车信息添加内容（西安三47） 2021-06-30 13:53:44 +08:00
joylink_zhangsai
f04cb9ae19 修改连挂时的列车逻辑； 2021-06-30 13:52:06 +08:00
joylink_zhangsai
d7c5e7cd32 修改：IBP盘部分功能实现 2021-06-30 13:03:16 +08:00
joylink_zhangsai
62027d50ee 修改：列车在第一站跳停无效bug（西安三46） 2021-06-30 09:32:18 +08:00
joylink_zhangsai
af25264080 修改：IBP盘bug 2021-06-29 18:02:06 +08:00
joylink_zhangsai
def44e9db2 Merge remote-tracking branch 'origin/test' into dev 2021-06-28 17:38:46 +08:00
joylink_zhangsai
0ee231475a 修改：列车信息添加内容（西安三47）（未完） 2021-06-28 17:35:37 +08:00
walker-sheng
88dad9cee4 Merge remote-tracking branch 'origin/test' into NTY-simulation 2021-06-25 18:44:04 +08:00
walker-sheng
378f6f43f4 仿真ats重构 2021-06-25 18:43:45 +08:00
joylink_zhangsai
588db159e0 修改：讯飞语音识别关闭动态修正 2021-06-25 15:07:52 +08:00
joylink_zhangsai
2454d53a5e 修改：剧本转换驾驶模式bug 2021-06-25 11:21:44 +08:00
walker-sheng
10b6ebc3c2 Merge remote-tracking branch 'origin/test' into NTY-simulation 2021-06-24 18:58:11 +08:00
walker-sheng
f225f67e4b 压力测试仿真不记录仿真时长 2021-06-24 18:57:59 +08:00
joylink_zhangsai
77c133cb7a 修改列车降级bug 2021-06-24 18:43:54 +08:00
walker-sheng
94d5f4a4ef 添加仿真压力测试接口 2021-06-24 18:06:21 +08:00
walker-sheng
1b1eadb370 站台设置折返策略操作逻辑 2021-06-24 16:47:45 +08:00
joylink_zhangsai
7ef0be2c82 Merge remote-tracking branch 'origin/test' into dev 2021-06-24 14:02:09 +08:00
joylink_zhangsai
0d44bfcab3 ZC增加<无服务>属性 2021-06-24 14:02:00 +08:00
joylink_zhangsai
0cbac09abb 修改列车升级逻辑 2021-06-24 14:00:53 +08:00
walker-sheng
cd0abf3f74 添加项目枚举 2021-06-24 11:26:15 +08:00
joylink_zhangsai
7a3bea2fee Merge branch 'test' into dev 2021-06-23 18:48:18 +08:00
joylink_zhangsai
be456adf6c 修改ITC移动授权发送方式（通过应答器） 2021-06-23 18:47:54 +08:00
walker-sheng
8d275849a1 Merge remote-tracking branch 'origin/test' into wechat-micro2-login 2021-06-23 18:26:06 +08:00
walker-sheng
80e3d237bc 添加第三方配置管理功能 
添加第三方用户仿真时长、用户考试结果同步流程
 2021-06-23 18:25:43 +08:00
joylink_zhangsai
d22c6f83cd 修改列车升级逻辑（兼容应答器） 2021-06-23 17:30:08 +08:00
joylink_zhangsai
2eee85699e Merge branch 'test' into dev 2021-06-23 16:04:28 +08:00
joylink_zhangsai
3bcae4a6b8 ZC增加<管理的区段>字段及相关逻辑 2021-06-23 16:04:15 +08:00
joylink_zhangsai
5c98d52006 修改移动授权丢失计时bug 2021-06-23 14:15:20 +08:00
joylink_zhangsai
a949f78450 列车初始化增加内容 2021-06-23 14:10:58 +08:00
joylink_zhangsai
4bf6f3fd5e 修改仿真数据校验bug 2021-06-23 13:37:08 +08:00
walker-sheng
757bd9d497 Merge remote-tracking branch 'origin/test' into wechat-micro2-login 2021-06-23 10:44:07 +08:00
walker-sheng
a5df50e114 添加2d模型数据管理接口调整 
更新sql
 2021-06-23 10:43:38 +08:00
walker-sheng
8f55119b8b 添加2d模型草稿发布接口 
添加2d模型数据管理接口
 2021-06-23 10:39:51 +08:00
joylink_zhangsai
12a82c7dca 修改列车加载bug；修改速度曲线计算bug 2021-06-23 10:32:23 +08:00
walker-sheng
427299528f Merge remote-tracking branch 'origin/test' into wechat-micro2-login 2021-06-22 17:46:26 +08:00
walker-sheng
65b7c6f9b1 地图数据——道岔添加型号字段 2021-06-22 17:46:07 +08:00
joylink_zhangsai
602ff1df1e Merge branch 'test' into dev 2021-06-22 13:08:54 +08:00
joylink_zhangsai
2c3fda7dcf 修改ZC移动授权计算bug 2021-06-22 13:08:36 +08:00
walker-sheng
7de1fd64ad Merge remote-tracking branch 'origin/test' into wechat-micro2-login 2021-06-22 11:26:26 +08:00
walker-sheng
48ae6734ff smart-doc相关配置调整，可由项目访问 2021-06-22 11:26:13 +08:00
joylink_zhangsai
9a206457fe Merge branch 'test' into dev 2021-06-22 10:46:55 +08:00
joylink_zhangsai
d741b550fb 仿真对话改用讯飞语音识别 2021-06-22 10:45:43 +08:00
joylink_zhangsai
e720603455 实现ARB计轴预复位逻辑 2021-06-22 10:42:26 +08:00
joylink_zhangsai
b55e81edec 增加车次发音匹配内容 2021-06-21 16:56:43 +08:00
joylink_zhangsai
5a68971025 修改：讯飞语音识别实现 2021-06-21 16:17:46 +08:00
walker-sheng
e8373fc6e6 Merge remote-tracking branch 'origin/test' into wechat-micro2-login 2021-06-21 15:49:51 +08:00
walker-sheng
eb16909a52 删除swagger依赖，将swagger注解替换为Java注释，引入smart-doc的maven插件，可以生成Rest接口的doc文档 
添加2d模型草稿增删改查接口和实现
 2021-06-21 15:49:30 +08:00
joylink_zhangsai
7558c10420 修改：区段进路解锁时不再对区段延续保护解锁 2021-06-21 15:45:17 +08:00
joylink_zhangsai
d350f15260 修改：IBP盘蜂鸣器bug 2021-06-21 14:17:19 +08:00
joylink_zhangsai
2339952cae 新增：设置ARB故障 2021-06-21 13:53:03 +08:00
joylink_zhangsai
eddd0171b7 Revert "修改：恢复ARB判定。 新增：<无ARB判定>线路配置" 
This reverts commit dce0f88e
 2021-06-21 09:36:44 +08:00
joylink_zhangsai
dce0f88ec4 修改：恢复ARB判定。 
新增：<无ARB判定>线路配置
 2021-06-18 15:15:36 +08:00
joylink_zhangsai
47bf98e80d 修改：IBP盘逻辑及数据 2021-06-18 15:13:59 +08:00
joylink_zhangsai
4929e21076 Merge remote-tracking branch 'origin/test' into dev 
# Conflicts:
#	src/main/java/club/joylink/rtss/services/VirtualRealityIbpService.java
 2021-06-18 09:12:47 +08:00
joylink_zhangsai
0493597a92 Merge remote-tracking branch 'origin/test' into test 2021-06-17 18:01:59 +08:00
joylink_zhangsai
8deff874d7 修改：IBP盘循环逻辑增加try-catch 2021-06-17 18:01:45 +08:00
walker-sheng
df508e3509 取消旧仿真定时销毁仿真任务，新定时兼容所有仿真定时删除逻辑 
仿真vo查询接口调整
 2021-06-17 17:56:56 +08:00
joylink_zhangsai
737edb9889 修改：IBP盘bug 2021-06-17 17:53:17 +08:00
walker-sheng
a6c43d601d 新仿真——添加定时任务：所有用户都不再订阅时销毁仿真 2021-06-17 16:17:41 +08:00
walker-sheng
f7529fa7f0 列车运行控制——摩擦阻力计算修改 2021-06-17 15:28:52 +08:00
walker-sheng
3639ea5a2f 列车运行控制——修改列车最高速度为350km/h 
新仿真逻辑——修改加载运行计划bug
 2021-06-17 15:27:53 +08:00
joylink_zhangsai
e51130b690 Merge branch 'test' into dev 2021-06-17 15:22:58 +08:00
walker-sheng
b5c001eacf Merge remote-tracking branch 'origin/test' into simulation-new-logic 2021-06-17 15:00:20 +08:00
walker-sheng
f7c4fbebbd 列车运行控制——修改列车最高速度为100km/h 2021-06-17 15:00:09 +08:00
joylink_zhangsai
f7910e91cc Merge remote-tracking branch 'origin/test' into test 2021-06-17 14:59:59 +08:00
joylink_zhangsai
7830e4ed63 修改：运行图加载计划查询bug 2021-06-17 14:59:22 +08:00
walker-sheng
d71ca4f07c Merge remote-tracking branch 'origin/test' into simulation-new-logic 2021-06-17 14:40:59 +08:00
walker-sheng
da878922fc 仿真抽象——观察者和被观察者接口调整（接口添加属性和值参数） 
新仿真逻辑——运行计划对象构建
列车运行控制——变为自动挡，速度控制问题和逻辑调整
 2021-06-17 14:40:16 +08:00
joylink_zhangsai
ad95a35a04 修改：IBP盘个别元素添加影响范围 2021-06-17 14:27:29 +08:00
joylink_zhangsai
7365c9b85f Merge remote-tracking branch 'origin/test' into dev 2021-06-17 10:50:32 +08:00
joylink_zhangsai
e67d9aa597 修改：设置联锁自动触发的逻辑；联锁自动触发条件检查 2021-06-17 10:48:43 +08:00
walker-sheng
6256f6b8b3 添加到那儿了小程序登录接口 
调整小程序code换用户信息接口，兼容多小程序
 2021-06-16 17:31:15 +08:00
walker-sheng
4ef20d7d62 Merge remote-tracking branch 'origin/test' into rt-simulation 2021-06-16 16:02:26 +08:00
walker-sheng
55e6cbd5e7 修改登录查询根据账号和密码查询账户逻辑：先根据邮箱或手机号查，如果不存在，根据账号查，查询出的用户数量如果等于1并且组织不存在，则找到；否则如果组织存在，根据组织筛选 2021-06-16 16:02:02 +08:00
joylink_zhangsai
c39648bd59 修改：换端逻辑的循环条件 2021-06-16 15:02:55 +08:00
joylink_zhangsai
02e961d5fa 新增：模板运行图编辑名称功能 2021-06-16 14:32:03 +08:00
joylink_zhangsai
b0bc56dd81 修改：IBP盘bug 2021-06-16 13:41:29 +08:00
joylink_zhangsai
344275fb68 修改：IBP盘实现方式 2021-06-16 13:04:03 +08:00
joylink_zhangsai
dea15cefac 新增：地图数据增加描述字段 2021-06-16 13:03:07 +08:00
joylink_zhangsai
fa76a0502a 修改：设置扣车后不触发进路问题（西安三39） 2021-06-16 10:10:51 +08:00
joylink_zhangsai
c3d4688268 Merge remote-tracking branch 'origin/test' into dev 2021-06-11 17:47:49 +08:00
joylink_zhangsai
c64bedaba5 修改：加载备用车时的重叠检测 2021-06-11 17:47:29 +08:00
walker-sheng
cd5d93bd7a Merge remote-tracking branch 'origin/test' into rt-simulation 2021-06-11 14:53:42 +08:00
walker-sheng
c0dbed5edc 添加根据用户id获取扮演的仿真成员接口 2021-06-11 14:53:31 +08:00
joylink_zhangsai
7d2738a889 新增：IBP盘计轴预复位 2021-06-11 14:49:00 +08:00
joylink_zhangsai
618ec74584 新增：加载备用车时检查列车重叠 2021-06-11 14:39:59 +08:00
joylink_zhangsai
c8c8a2132f 修改：加载备用车时，s/t Number的值改为空字符串（解决加载备用车有上一次的车次的问题） 2021-06-11 11:10:29 +08:00
joylink_zhangsai
92d187684c Merge remote-tracking branch 'origin/test' into dev 2021-06-11 09:55:40 +08:00
joylink_zhangsai
3b1f08df5d 移除：自动缓解EB逻辑 2021-06-11 09:55:20 +08:00
walker-sheng
bb28a0ab7d 用户管理添加根据账户、父账户条件查询 2021-06-11 09:21:23 +08:00
walker-sheng
680edf87e7 Merge remote-tracking branch 'origin/test' into third-part-control 2021-06-10 18:16:30 +08:00
walker-sheng
e6c6f9335b 第三方登录无企业账户bug修改 2021-06-10 18:16:18 +08:00
joylink_zhangsai
1a0bc76c9d 修改：账户数据插入方式 2021-06-10 17:02:31 +08:00
joylink_zhangsai
96af0971ec 修改：判断抢路逻辑（西安三问题29） 2021-06-10 15:59:13 +08:00
joylink_zhangsai
d7b0e8c065 Merge remote-tracking branch 'origin/test' into dev 2021-06-10 14:39:46 +08:00
joylink_zhangsai
2fe8097887 修改：发布地图一键校验功能以创建仿真的方式校验 2021-06-10 14:39:15 +08:00
walker-sheng
760a2d7768 权限分发管理添加分发给指定用户功能 
用户根据组织查询报错修复
添加用户删除功能（逻辑删除，只是在用户管理列表里不显示）
 2021-06-10 13:27:19 +08:00
joylink_zhangsai
57122eed48 修改自定义sql中的sys_user 2021-06-10 11:20:52 +08:00
joylink_zhangsai
0c432a60ca 修改自定义sql中的sys_user 2021-06-10 11:10:31 +08:00
walker-sheng
09de047a74 Merge remote-tracking branch 'origin/test' into third-part-control 2021-06-09 18:30:19 +08:00
walker-sheng
afc937068a 添加第三方账户仿真权限逻辑判断 
添加在线用户管理接口
 2021-06-09 18:30:02 +08:00
joylink_zhangsai
81c691d65d 修改：延续保护解锁bug 2021-06-09 16:13:48 +08:00
joylink_zhangsai
d86ddf5bd4 修改：延续保护解锁bug 2021-06-09 14:50:14 +08:00
walker-sheng
551bdaebf9 Merge remote-tracking branch 'origin/test' into third-part-control 2021-06-09 10:56:56 +08:00
walker-sheng
ec0820abe5 Merge remote-tracking branch 'origin/test' into third-part-control 
# Conflicts:
#	src/main/java/club/joylink/rtss/controller/runplan/RunPlanDraftController.java
#	src/main/java/club/joylink/rtss/services/IRealLineService.java
#	src/main/java/club/joylink/rtss/services/RealLineService.java
#	src/main/java/club/joylink/rtss/services/SysUserService.java
#	src/main/java/club/joylink/rtss/services/simulation/ProjectSimulationServiceImpl.java
#	src/main/java/club/joylink/rtss/services/simulation/SchedulingServiceImpl.java
#	src/main/java/club/joylink/rtss/simulation/cbtc/ProjectJointSimulationServiceImpl.java
#	src/main/java/club/joylink/rtss/simulation/cbtc/data/vo/SimulationVO.java
#	src/main/java/club/joylink/rtss/simulation/rt/RtSimulationService.java
 2021-06-09 10:56:23 +08:00
joylink_zhangsai
1267565d53 Merge branch 'test' into dev 2021-06-09 10:52:43 +08:00
walker-sheng
60d2b7118a Merge remote-tracking branch 'origin/test' into map-data-handle 2021-06-09 10:51:13 +08:00
joylink_zhangsai
91be05e37a 修改：延续保护解锁bug 2021-06-09 10:50:36 +08:00
walker-sheng
a7315c4adf 添加创建账户接口 
添加第三方登录接口逻辑
 2021-06-09 10:31:34 +08:00
joylink_zhangsai
fe66f80bc7 修改：确认运行至前方站/越红灯指令取消自动升级逻辑（西安三问题36） 2021-06-08 18:12:25 +08:00
joylink_zhangsai
e8c7c524f7 修改：确认运行至前方站/越红灯指令取消自动升级逻辑 2021-06-08 18:08:47 +08:00
walker-sheng
0e9b18db75 修改SysUser为SysAccount，修改相关名称 
账户表添加第三方相关字段
 2021-06-08 16:08:33 +08:00
joylink_zhangsai
5a5f8a4508 新增：IBP盘扣车状态（西安三问题35） 2021-06-08 15:46:54 +08:00
joylink_zhangsai
c3c8ebaf38 新增：计划车车次不能重复（西安三问题28） 2021-06-08 15:40:57 +08:00
joylink_zhangsai
55365d9b12 修改：延续保护解锁时不检查锁闭状态（西安三问题33） 2021-06-08 14:16:56 +08:00
joylink_zhangsai
15338c67d9 新增：列车抵达站台时更新扣车状态 2021-06-08 13:21:06 +08:00
joylink_zhangsai
5807323b89 修改：非通信车占用区段移动授权计算bug 2021-06-07 17:43:19 +08:00
walker-sheng
b1caa5125b Merge remote-tracking branch 'origin/test' into map-data-handle 2021-06-07 17:01:27 +08:00
walker-sheng
dbdf07fb28 地图vo对象移动到新的文件夹（未完成） 2021-06-07 17:01:02 +08:00
joylink_zhangsai
49f6b357d3 新增：教学管理查看使用时长 2021-06-07 16:11:55 +08:00
joylink_zhangsai
179b880409 修改：PSL逻辑bug 2021-06-07 11:06:30 +08:00
joylink_zhangsai
f25f8f5972 Merge remote-tracking branch 'origin/test' into dev 2021-06-07 08:50:41 +08:00
joylink_zhangsai
1d103955ce 新增：PSL盘逻辑 2021-06-07 08:50:00 +08:00
walker-sheng
6aed3492ba Merge remote-tracking branch 'origin/test' into rt-train-drive 2021-06-04 18:07:33 +08:00
walker-sheng
ade76fedbd 新接近区段数据生成逻辑 
联锁触发进路逻辑开发
 2021-06-04 18:07:14 +08:00
joylink_zhangsai
a93937c582 新增：限速指令填负数可以取消限速 2021-06-04 16:36:28 +08:00
walker-sheng
ffba9f0dbf Merge remote-tracking branch 'origin/test' into rt-train-drive 2021-06-04 09:14:57 +08:00
joylink_zhangsai
0b77fe4090 Merge remote-tracking branch 'origin/test' into dev 2021-06-04 08:48:17 +08:00
joylink_zhangsai
4f5d79f008 修改：进路路径构建 2021-06-03 17:57:19 +08:00
walker-sheng
90a1caa759 触发式消息发布对象抽象封装 
虚拟真实设备状态消息发布逻辑
列车运行方向bug修改
 2021-06-03 16:20:54 +08:00
joylink_zhangsai
7bba9fb3fa Merge remote-tracking branch 'origin/test' into dev 2021-06-03 16:15:18 +08:00
joylink_zhangsai
af554059fa 修改：设置头码车的寻路逻辑 2021-06-03 16:01:13 +08:00
joylink_zhangsai
274b5f30cb 修改：设置头码车的寻路逻辑 2021-06-03 15:40:57 +08:00
joylink_zhangsai
b17175b2af 修改：设置头码车时的寻路逻辑 2021-06-03 14:40:45 +08:00
joylink_zhangsai
ce1425198c 修改：设置头码车时的寻路逻辑 2021-06-03 14:15:06 +08:00
joylink_zhangsai
b548a4fed1 修改：查询地图版本接口 2021-06-03 11:29:56 +08:00
joylink_zhangsai
c464a77768 修改：头码车路径构建bug 2021-06-03 10:31:10 +08:00
joylink_zhangsai
ea28f9a0d8 修改：非通信车占用移动授权判断逻辑 --bug292 2021-06-03 09:55:04 +08:00
walker-sheng
9498b710c1 大铁列车驾驶控制和列车运行逻辑重构 
通用获取仿真成员接口调整
仿真消息发布对象重构（分为定时消息发布和触发式消息发布，一个发布器可以支持多个订阅）
 2021-06-02 17:56:09 +08:00
joylink_zhangsai
506b908a04 修改机器人驾驶bug 2021-06-02 17:54:14 +08:00
joylink_zhangsai
4f339de3cd 修改ATP自动缓解EB逻辑 --bug286 2021-06-02 17:15:48 +08:00
joylink_zhangsai
a9b21f7609 设置头码车逻辑修改 2021-06-02 16:58:23 +08:00
joylink_zhangsai
f291898071 设置头码车逻辑修改 2021-06-02 10:04:46 +08:00
joylink_zhangsai
b2967dc346 修改：移动授权计算；恢复ATO开启时EB自动缓解 2021-06-01 18:27:05 +08:00
joylink_zhangsai
e250aa9546 新增：运行图按规则加载 2021-06-01 16:34:07 +08:00
joylink_zhangsai
d8dc705efd 修改：信号机状态发送bug 2021-06-01 14:19:07 +08:00
joylink_zhangsai
acc47117f4 Merge remote-tracking branch 'origin/test' into test 2021-06-01 14:00:00 +08:00
joylink_zhangsai
d36928da2b 新增：信号机接近锁闭字段及状态发送；列车操纵杆字段；托管功能选择逻辑区段时，转为物理区段；几个新指令；切除ATP时取消信号EB；ATP循环逻辑检查缓解EB。 
去掉：自动缓解EB逻辑
 2021-06-01 13:59:43 +08:00
walker-sheng
e6d0b5c35f Merge remote-tracking branch 'origin/test' into test 2021-05-31 15:53:07 +08:00
walker-sheng
7bd75e7c07 仿真消息发布对象抽象调整，仿真推送流程调整（消息订阅/发布 取消/user前缀） 
添加列车车载相关逻辑
 2021-05-31 15:52:21 +08:00
joylink_zhangsai
cd8efe1a21 修改设置头码车逻辑 2021-05-31 13:05:00 +08:00
thesai
ac063978f8 对接讯飞语音识别服务；语音训练接口使用讯飞语音识别 2021-05-30 21:29:59 +08:00
joylink_zhangsai
8bd00bdbd9 增加调头指令 2021-05-28 18:08:15 +08:00
joylink_zhangsai
aa40f830fc 修改联锁生成时code构建bug 2021-05-28 18:07:32 +08:00
joylink_zhangsai
ff7f120a43 Merge remote-tracking branch 'origin/test' into test 2021-05-28 17:50:04 +08:00
joylink_zhangsai
5dbba35cdf 修改头码车运行bug 2021-05-28 17:49:53 +08:00
walker-sheng
2383d1d2bf Merge remote-tracking branch 'origin/test' into test 2021-05-28 16:47:07 +08:00
walker-sheng
ee60ef2d26 新仿真列车运行逻辑调整 
添加列车驾驶控制操作
 2021-05-28 16:46:52 +08:00
joylink_zhangsai
0a2ea4ad09 修改：头码车进路办理逻辑 2021-05-28 15:40:16 +08:00
walker-sheng
7afe126f81 Merge remote-tracking branch 'origin/test' into test 2021-05-28 15:21:41 +08:00
walker-sheng
b5aa56a127 延续保护接口调整 2021-05-28 15:21:17 +08:00
joylink_zhangsai
d57b75ed72 修改：头码车运行逻辑 2021-05-28 15:08:28 +08:00
joylink_zhangsai
bcf133e5f7 修改bug 2021-05-27 18:22:14 +08:00
walker-sheng
b5e9cb50f2 Merge remote-tracking branch 'origin/test' into test 2021-05-27 17:31:03 +08:00
walker-sheng
9a6f5b18ae 添加新的侧防数据管理接口 
用户管理添加id查询条件
 2021-05-27 17:30:40 +08:00
joylink_zhangsai
0414fcb0fd Merge remote-tracking branch 'origin/test' into test 2021-05-27 17:02:54 +08:00
joylink_zhangsai
e26f0e11af 新增：RM和NRM会断开通信；进路开放信号的信号机所在站台屏蔽门故障时关闭信号。修改：非通信车接近关闭的信号机时没有物理点灯 2021-05-27 17:02:36 +08:00
walker-sheng
e7db4a7382 修改bug 2021-05-27 15:30:10 +08:00
walker-sheng
87881c2c2a 地图绘制进路数据更新逻辑 2021-05-27 15:25:09 +08:00
joylink_zhangsai
5e818e06ec Merge remote-tracking branch 'origin/test' into test 2021-05-27 13:34:42 +08:00
joylink_zhangsai
5281528c45 语音识别修正 2021-05-27 13:34:23 +08:00
joylink_zhangsai
f2de22e0d8 延续保护中的设备状态不正确时，取消延续保护锁闭状态 2021-05-27 13:33:43 +08:00
walker-sheng
bc5b9c5009 地图绘制进路数据、延续保护数据、信号机接近区段数据维护接口添加 2021-05-27 10:19:56 +08:00
walker-sheng
d656a5071b Merge remote-tracking branch 'origin/test' into test 2021-05-26 18:28:53 +08:00
joylink_zhangsai
bdb2777522 修改头码车不调头问题 2021-05-26 17:47:02 +08:00
joylink_zhangsai
9626833d85 去掉方向杆检查 2021-05-26 17:36:17 +08:00
walker-sheng
76b31e9ac3 Merge remote-tracking branch 'origin/test' into test 2021-05-26 14:55:27 +08:00
joylink_zhangsai
3a283d1227 添加指令循环执行任务 2021-05-26 14:35:29 +08:00
joylink_zhangsai
c97b7caccc 修改仿真数据校验bug 2021-05-26 13:29:28 +08:00
joylink_zhangsai
076b1ad6f8 ats进路触发逻辑修改以处理小交路折返堵车问题（西安三香湖湾）；侧防满足条件修改；修改强制取消进路线路配置描述及取消进路操作逻辑；修改信号机接近区段占用、进路接近锁闭的判断逻辑。修改宁波、哈尔滨、西安三若干问题 2021-05-26 13:15:27 +08:00
walker-sheng
85ccec7486 新仿真（大铁线路）列车驾驶功能调试 2021-05-25 18:05:55 +08:00
walker-sheng
d655347512 Merge remote-tracking branch 'origin/test' into test 2021-05-24 10:43:51 +08:00
walker-sheng
79dca6bd8d 站间运行等级和停站时间数据创建、修改流程 2021-05-24 10:43:36 +08:00
thesai
4eac911a36 修改仿真查询bug 2021-05-21 17:53:42 +08:00
joylink_zhangsai
910aeab327 虚拟信号机设置熔断故障无效 2021-05-21 10:47:56 +08:00
joylink_zhangsai
7ce6421b66 权限管理功能增加 2021-05-21 10:47:26 +08:00
joylink_zhangsai
8418ac8d35 Merge remote-tracking branch 'origin/test' into test 2021-05-20 17:58:32 +08:00
joylink_zhangsai
64d26766cf 文件管理添加新类型、新接口 2021-05-20 17:55:23 +08:00
walker-sheng
0ba42e1021 西安3号线新运行图导入调整 2021-05-19 17:56:08 +08:00
walker-sheng
9f2a02fe99 Merge remote-tracking branch 'origin/test' into test 2021-05-19 15:09:04 +08:00
walker-sheng
9cb57676b0 列车停站时间计算修改，不再缩减停站时间 
仿真数据构建添加运行等级、停站时间、站台区段可到达的临近站台区段等数据构建（未完）
配置：ATS是否自动处理人工设置的站前折返自动更新车次构建未添加bug修改
 2021-05-19 15:07:41 +08:00
joylink_zhangsai
e1481d66e0 3维数据查询bug修改 2021-05-19 15:05:51 +08:00
joylink_zhangsai
c31d38dc66 大客流代码结构修改 2021-05-19 10:21:38 +08:00
joylink_zhangsai
e0e8147ff9 仿真管理功能兼容 2021-05-18 18:35:26 +08:00
joylink_zhangsai
a23a0594b7 仿真管理功能兼容 2021-05-18 18:32:18 +08:00
joylink_zhangsai
ac91ab7f46 控制权转换的机器人回复逻辑触发条件修改（多个行值） 2021-05-18 17:33:24 +08:00
joylink_zhangsai
11d5f6168b 增加<添加行值角色>功能；添加ATP进路<可以自动追踪>字段的判断、赋值 2021-05-18 14:02:58 +08:00
joylink_zhangsai
358d8ce130 文件管理bug修改 2021-05-17 19:04:33 +08:00
joylink_zhangsai
9b26686941 文件管理bug修改 2021-05-17 19:03:32 +08:00
joylink_zhangsai
570e038bc5 图纸绑定bug修改 2021-05-17 18:59:44 +08:00
joylink_zhangsai
cf34968f4d 语音文件上传方法修改 2021-05-17 18:29:09 +08:00
joylink_zhangsai
a440ba3437 添加图纸管理功能 2021-05-17 18:28:44 +08:00
joylink_zhangsai
62a3d2a517 Merge remote-tracking branch 'origin/test' into test 2021-05-17 18:12:07 +08:00
joylink_zhangsai
bfffdfdb23 哈尔滨紧急停车特殊车站处理（添加连锁配置） 2021-05-17 17:53:32 +08:00
walker-sheng
c3bec9a093 实现移动列车操作逻辑 2021-05-14 17:56:59 +08:00
walker-sheng
6d5d46e849 仿真权限添加郑州共赢都可用 2021-05-14 15:57:12 +08:00
walker-sheng
dba887038d 实现添加车次和删除车次逻辑 
添加释放指令和设置保护操作
 2021-05-14 15:38:22 +08:00
Jade
c2172ba185 Merge remote-tracking branch 'origin/test' into test 2021-05-14 13:21:33 +08:00
Jade
c159029d6f fix 文档接口 2021-05-14 13:21:20 +08:00
walker-sheng
7ec7de8aa6 rt仿真调整 2021-05-13 15:14:50 +08:00
walker-sheng
190f510ba3 rt仿真调整 2021-05-13 15:14:18 +08:00
joylink_zhangsai
f189b728fd 旧仿真继承新仿真-添加大客流任务-添加真实设备任务；rtSimulationMember实现buildVO方法 2021-05-13 13:19:06 +08:00
joylink_zhangsai
4736b6c326 Merge remote-tracking branch 'origin/test' into test 2021-05-12 18:28:22 +08:00
joylink_zhangsai
ddf981be2e 旧仿真继承新仿真接口 2021-05-12 18:11:03 +08:00
Jade
105e824236 文档接口 2021-05-12 13:44:50 +08:00
walker-sheng
5de44e7263 CBTC仿真修改路径构建bug 2021-05-11 16:50:05 +08:00
walker-sheng
7fc5acb638 CBTC仿真修改路径构建缺虚拟信号机bug 2021-05-11 16:38:14 +08:00
walker-sheng
9cb5e4e34d Merge remote-tracking branch 'origin/test' into restruct-new 2021-05-11 16:02:03 +08:00
joylink_zhangsai
37aa551580 Merge remote-tracking branch 'origin/test' into test 2021-05-11 16:01:15 +08:00
joylink_zhangsai
1c7099ce42 ATP和联锁进路排列条件修改 2021-05-11 16:00:58 +08:00
walker-sheng
8cdf4f7100 仿真结构——仿真操作分发添加操作及结果记录对象并添加仿真操作事件发布 2021-05-11 15:43:02 +08:00
walker-sheng
315fea4c78 Merge remote-tracking branch 'origin/test' into restruct-new 2021-05-11 15:19:11 +08:00
Jade
980b0531d0 simulationJob 2021-05-11 15:17:48 +08:00
walker-sheng
4cb457ab16 Merge remote-tracking branch 'origin/test' into restruct-new 
# Conflicts:
#	src/main/java/club/joylink/rtss/simulation/job/SimulationScheduledJob.java
 2021-05-11 15:06:42 +08:00
Jade
e41342f0ce simulationJob 2021-05-11 15:04:15 +08:00
walker-sheng
489733931d Merge remote-tracking branch 'origin/test' into restruct-new 2021-05-11 13:45:58 +08:00
Jade
ac98015ed9 simulationJob 2021-05-11 10:49:48 +08:00
walker-sheng
1a79319379 Merge remote-tracking branch 'origin/test' into restruct-new 
# Conflicts:
#	src/main/java/club/joylink/rtss/simulation/Simulation.java
#	src/main/java/club/joylink/rtss/simulation/job/SimulationScheduledJob.java
 2021-05-11 09:56:40 +08:00
Jade
19bee0ab24 simulationJob 2021-05-11 09:53:21 +08:00
walker-sheng
b61a416da1 Merge remote-tracking branch 'origin/test' into restruct-new 2021-05-10 17:18:52 +08:00
joylink_zhangsai
730ab7cac9 发布地图数据检查与否由配置决定；获取地图数据接口添加检查配置数据 2021-05-10 17:11:13 +08:00
joylink_zhangsai
fb2f66f275 添加校验所有地图数据接口 2021-05-10 15:44:34 +08:00
walker-sheng
ef7c81fd51 仿真结构——抽象仿真设备对象状态变化监控（响应式/触发式） 
轨道交通仿真——实现仿真道岔、信号机、计轴和联锁道岔、信号机、区段设备状态变化通知监控逻辑
 2021-05-10 15:04:40 +08:00
joylink_zhangsai
a4b42d13d8 列车到站后先记录实际运行图信息；实迹运行图添加是否站前折返字段 2021-05-10 14:34:10 +08:00
joylink_zhangsai
f3115f7faf 大铁道岔单解添加联动 2021-05-08 16:31:53 +08:00
joylink_zhangsai
ed5f05a23a 大铁侧防锁闭添加条件<道岔未占用> 2021-05-08 16:26:51 +08:00
joylink_zhangsai
c7d5c38b73 大铁进路办理代码结构修改；大铁道岔转动、单/解锁联动；cilRepository.config赋值 2021-05-08 14:47:20 +08:00
joylink_zhangsai
f234e39935 添加联锁机重启操作（未测试）；修改大铁侧向列车排列不了bug；添加ATS故障（未测试） 2021-05-08 09:21:13 +08:00
joylink_zhangsai
79a26eb86c 场景录音用户查询bug修改 2021-05-06 17:04:15 +08:00
joylink_zhangsai
5284177cf2 场景语音识别错误信息记录修改 2021-05-06 16:12:54 +08:00
joylink_zhangsai
0763a46ced 大铁道岔联动转动 2021-05-06 15:52:38 +08:00
joylink_zhangsai
1660113cb3 <整个场景的语音校验接口>小改动 2021-05-06 15:02:14 +08:00
joylink_zhangsai
16c88d6357 场景语音录制相关接口实现 2021-05-06 13:50:17 +08:00
thesai
05b88e4a1c 重载语音识别方法 2021-05-05 21:43:42 +08:00
thesai
7b960c809e 大铁进路排列代码结构调整 2021-05-05 18:54:55 +08:00
joylink_zhangsai
0237c53000 场景语音录制 2021-04-30 18:29:07 +08:00
joylink_zhangsai
edf2973634 竞赛错误语音记录 2021-04-30 14:06:50 +08:00
joylink_zhangsai
732a856207 大铁引导办理增加检查 2021-04-30 13:04:01 +08:00
joylink_zhangsai
687ada1133 竞赛场景恢复 2021-04-29 18:59:35 +08:00
joylink_zhangsai
5db771b765 大铁排列进路区段提前锁闭问题修改 2021-04-29 18:47:49 +08:00
joylink_zhangsai
de20ed1f5b 大铁操作bug修改 2021-04-29 18:18:48 +08:00
joylink_zhangsai
7cd4eaac15 大铁进路逻辑修改；剧本车次识别增加内容 2021-04-29 17:31:44 +08:00
joylink_zhangsai
e966d6360c 竞赛场景暂时走小程序逻辑、操作类动作直接完成（为了测试） 2021-04-29 16:46:02 +08:00
joylink_zhangsai
38ce09edf8 竞赛场景暂时走小程序逻辑、非会话动作直接完成（为了测试） 2021-04-29 16:36:47 +08:00
joylink_zhangsai
b34a77df10 数据构建bug修改 2021-04-29 15:57:57 +08:00
joylink_zhangsai
d5b588d21a Merge remote-tracking branch 'origin/test' into test 2021-04-29 15:47:47 +08:00
joylink_zhangsai
f9aa41c5bd 语音识别结果修正内容增加 2021-04-29 15:47:34 +08:00
walker-sheng
e17503d902 Merge remote-tracking branch 'origin/test' into test 2021-04-29 15:30:11 +08:00
walker-sheng
9089cd122e 轨道交通仿真——commonRepository的轨道路径构建修改 2021-04-29 15:29:57 +08:00
joylink_zhangsai
3f45fc1c8f 语音训练功能添加结果修正；大铁仿真bug修改；添加大铁项目登录 2021-04-29 13:30:45 +08:00
walker-sheng
7abffd511e Merge remote-tracking branch 'origin/test' into test 2021-04-29 10:47:20 +08:00
walker-sheng
d1ff82aaf0 仿真结构——仿真、仿真成员、仿真用户vo信息通用获取接口及流程抽象实现 2021-04-29 10:47:02 +08:00
joylink_zhangsai
bd80a423c1 语音识别服务修改 2021-04-29 09:21:29 +08:00
joylink_zhangsai
604bfd0d20 大铁引导bug修改 2021-04-28 18:49:57 +08:00
joylink_zhangsai
5604630845 道岔初始化bug修改；接近锁闭判断条件修改； 2021-04-28 18:12:00 +08:00
walker-sheng
ecdd948079 Merge remote-tracking branch 'origin/test' into test 2021-04-28 17:29:02 +08:00
walker-sheng
66dcf3541c 大铁线路信号机接近区段数据构建 2021-04-28 17:28:47 +08:00
joylink_zhangsai
6c80e68b75 取消列车进入进路逻辑判断；引导信号颜色修改；进路初始化逻辑添加 2021-04-28 17:26:08 +08:00
joylink_zhangsai
88ec13709f Merge remote-tracking branch 'origin/test' into test 2021-04-28 15:40:34 +08:00
joylink_zhangsai
1505ff4604 大铁引导总锁和通过进路操作 2021-04-28 15:40:20 +08:00
walker-sheng
035f9fffdf 大铁线路进路数据构建bug修改，添加删除时更新敌对关系逻辑 2021-04-28 14:51:26 +08:00
walker-sheng
d9226d47b6 轨道交通仿真——srSignal状态初始化修改 2021-04-28 10:44:44 +08:00
walker-sheng
6b69b956b6 Merge remote-tracking branch 'origin/test' into test 2021-04-28 10:34:35 +08:00
walker-sheng
f26d4516e6 轨道交通仿真——仿真设备添加状态初始化 2021-04-28 10:34:15 +08:00
joylink_zhangsai
6d40a8c5d9 Merge remote-tracking branch 'origin/test' into test 2021-04-28 09:29:00 +08:00
joylink_zhangsai
c231bc5ead 大铁仿真操作实现中 2021-04-28 09:28:49 +08:00
walker-sheng
bd3b7b8087 轨道交通仿真——仿真设备添加状态初始化 2021-04-27 18:42:37 +08:00