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 |
|
|
|
6b16dc6fb4
|
删除查询进路路径方法中，虚拟信号机下的进路只有一条的断言和逻辑
|
2021-11-22 09:36:06 +08:00 |
|
|
|
247da90858
|
Merge remote-tracking branch 'origin/test' into master-huawei
|
2021-11-19 21:01:54 +08:00 |
|
|
|
4ab64ffe1b
|
修改转辙机告警短信发送逻辑
|
2021-11-19 15:04:26 +08:00 |
|
|
|
cfc33cc649
|
Merge remote-tracking branch 'origin/test' into master-huawei
|
2021-11-18 18:59:52 +08:00 |
|
|
|
fce534731a
|
添加用户登录信息清理逻辑
修改在线用户信息查询接口bug
|
2021-11-18 16:14:09 +08:00 |
|
|
|
de74214d67
|
添加短信服务接口和转辙机发送短信告警信息功能
|
2021-11-18 14:33:36 +08:00 |
|
|
|
d21863effd
|
修改清除区段占用时，叉芯关联的物理区段占用状态未清除掉的bug
|
2021-11-17 12:02:24 +08:00 |
|
|
|
6dea82166e
|
Merge remote-tracking branch 'origin/test' into test
|
2021-11-17 10:16:56 +08:00 |
|
|
|
54a7a5ea3d
|
修改包名Sr->sr
|
2021-11-17 10:16:42 +08:00 |
|
Jade
|
eaaf23720c
|
场景旧数据反序列化处理
|
2021-11-15 16:36:08 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
187d91ce08
|
增加转NRM模式指令；上饶增加控制列车功能
|
2021-11-08 16:50:16 +08:00 |
|
|
|
d9bab161d1
|
锁闭道岔的进路改为Set以避免同一进路多次添加
|
2021-11-08 14:44:32 +08:00 |
|
|
|
4b034565ed
|
上饶沙盘通用逻辑
|
2021-11-08 11:28:28 +08:00 |
|
|
|
2903520435
|
Merge remote-tracking branch 'origin/test' into test
|
2021-11-08 11:26:16 +08:00 |
|
|
|
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 |
|
|
|
a64c161845
|
Merge branch 'test' into master-huawei
|
2021-10-27 18:06:47 +08:00 |
|
|
|
4e7a87cf6b
|
Merge remote-tracking branch 'origin/test' into test
|
2021-10-27 17:36:38 +08:00 |
|
|
|
9c7e710b62
|
修改实训扮演行值的逻辑
|
2021-10-27 17:36:16 +08:00 |
|
|
|
7bb5c45e52
|
车站扣不住车bug修改
|
2021-10-27 17:29:40 +08:00 |
|
|
|
9fbffe7f84
|
Merge remote-tracking branch 'origin/test' into test
|
2021-10-27 16:43:06 +08:00 |
|
|
|
d6eddf138b
|
不生成车辆段、停车场里设备的实训；加载实训时根据定位设备code让成员扮演行值
|
2021-10-27 16:41:32 +08:00 |
|
|
|
aacca91bb8
|
Merge remote-tracking branch 'origin/test' into master-huawei
|
2021-10-26 18:46:42 +08:00 |
|
|
|
871287eb1c
|
ibp盘关闭锁紧信号bug修改
|
2021-10-26 18:36:01 +08:00 |
|
|
|
89c23e50e3
|
修改道岔转动及控制权交出、接收bug
|
2021-10-25 16:05:35 +08:00 |
|
|
|
13506c2faa
|
修改，按计划行车时，列车前方进路中道岔不进路锁闭bug
|
2021-10-25 14:52:35 +08:00 |
|
|
|
b445b59290
|
上饶沙盘(除列车)
|
2021-10-22 18:06:02 +08:00 |
|
|
|
fd9a54f816
|
修改区段占用状态更新逻辑
|
2021-10-20 13:59:24 +08:00 |
|
|
|
e4891a7b8f
|
上饶沙盘（未完）
|
2021-10-15 18:18:35 +08:00 |
|
|
|
554246fa7d
|
修改地图数据校验
|
2021-10-15 18:17:55 +08:00 |
|
|
|
c319250093
|
修改福州实训问题
|
2021-10-14 14:30:12 +08:00 |
|
|
|
38848dbd14
|
修改义乌配置
|
2021-10-13 18:02:17 +08:00 |
|
|
|
cc822474f7
|
修改隔离模式默认状态
|
2021-10-13 14:49:09 +08:00 |
|
|
|
a828a2a03e
|
义乌iscs调整
|
2021-10-12 14:56:21 +08:00 |
|
|
|
7511b23764
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-10-12 10:42:27 +08:00 |
|
|
|
e1b6675967
|
增加上饶沙盘项目、地图数据增加上饶沙盘设备编号
|
2021-10-12 10:42:03 +08:00 |
|
|
|
4016623302
|
进路道岔解锁bug修改（A进路道岔解锁导致已经办理的B进路道岔被解锁）
|
2021-10-12 09:57:42 +08:00 |
|
|
|
7e656054f3
|
按计划行车进路解锁逻辑bug修改
|
2021-10-11 18:25:56 +08:00 |
|
|
|
b13944eeea
|
进路路径筛选进路逻辑调整
|
2021-10-11 17:01:01 +08:00 |
|
|
|
dc80448b59
|
Merge remote-tracking branch 'origin/test' into test
|
2021-10-11 16:59:51 +08:00 |
|
|
|
fc8f17cdb4
|
按计划行车办理进路、解锁进路逻辑调整
进路路径筛选进路逻辑调整
直接办理进路道岔转动bug修改
|
2021-10-11 16:59:33 +08:00 |
|
|
|
1d9ad4eeb8
|
地图显示配置增加参数
|
2021-10-11 15:22:11 +08:00 |
|
|
|
b9774a08fc
|
取消行车间隔调度生效逻辑
|
2021-10-11 15:16:30 +08:00 |
|
|
|
8553584150
|
南京列车调度-行车间隔调度
|
2021-10-11 14:43:57 +08:00 |
|
|
|
55769ee2dc
|
删除无用代码和注解
|
2021-10-09 11:14:02 +08:00 |
|
|
|
765eae6f61
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-10-08 15:53:35 +08:00 |
|
|
|
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 |
|
|
|
ba091b3edf
|
Merge remote-tracking branch 'origin/test' into master-huawei
|
2021-09-28 18:32:11 +08:00 |
|
|
|
3a52cbc4e4
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-09-28 18:14:40 +08:00 |
|
|
|
8f43e51dba
|
列车运行级别升级需ma的atp防护速度为正；计轴故障区段不会再显示通信车占用
|
2021-09-28 18:14:28 +08:00 |
|
Jade
|
d48547959f
|
车辆段联锁生成-终端按钮
|
2021-09-28 17:23:46 +08:00 |
|
|
|
a345f73528
|
设备指令完成后将指令置为null（设置、取消屏蔽门无法关闭故障后，屏蔽门还是无法关闭）
|
2021-09-28 17:22:42 +08:00 |
|
|
|
ea64d61fa5
|
列车车头/车尾在计轴故障区段时无法升级至CBTC
|
2021-09-28 16:23:59 +08:00 |
|
|
|
1b6ffa0b8c
|
扣车状态不再影响更新列车target；ato开启条件减少
|
2021-09-28 16:14:46 +08:00 |
|
|
|
7ba23fb272
|
按计划行车时，<办理ats选择的进路>逻辑迁移
|
2021-09-28 15:26:10 +08:00 |
|
|
|
ec640aafc4
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-09-28 15:17:19 +08:00 |
|
|
|
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 |
|
|
|
6872f9b7bf
|
指令适配新的列车操作方式
|
2021-09-27 17:18:31 +08:00 |
|
|
|
f240238e56
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-09-27 14:45:18 +08:00 |
|
|
|
2c5b139ff8
|
添加切换预选模式指令、移除切换驾驶模式指令
|
2021-09-27 14:45:10 +08:00 |
|
|
|
d7b5df2b3b
|
修改自动/联动开关门判定并添加机器人开关门逻辑
|
2021-09-27 14:43:23 +08:00 |
|
|
|
d350d4fd6b
|
Merge remote-tracking branch 'origin/test' into test
|
2021-09-27 10:41:56 +08:00 |
|
|
|
28997a2b52
|
仿真数据构建添加信号机类型和型号校验
联锁生成信号机型号不正确时抛出异常
|
2021-09-27 10:41:43 +08:00 |
|
|
|
3ebfe664d5
|
列车预选模式降RM依然粉光带bug修改
|
2021-09-27 10:02:35 +08:00 |
|
|
|
316e43d697
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-09-26 18:09:08 +08:00 |
|
|
|
a50ab163eb
|
发布地图导入导出修改
|
2021-09-26 18:08:59 +08:00 |
|
|
|
e94772cff0
|
Merge remote-tracking branch 'origin/test' into test
|
2021-09-26 17:39:22 +08:00 |
|
|
|
bc0a6c5757
|
显示数据添加修订设备位置相关属性
|
2021-09-26 17:39:09 +08:00 |
|
|
|
84344771c1
|
移动速度释放EB逻辑；注掉自动确认速度释放逻辑
|
2021-09-26 16:37:27 +08:00 |
|
|
|
b494fdfa6c
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-09-26 16:02:53 +08:00 |
|
|
|
3e9b4e677d
|
增加速度释放消息及相关逻辑
|
2021-09-26 16:02:42 +08:00 |
|
|
|
7916b63df8
|
修改车站故障枚举及逻辑
修改信号机故障枚举及逻辑
添加草稿地图信号机型号数据处理
|
2021-09-26 15:44:28 +08:00 |
|
|
|
1a23bd4a82
|
【增加/修改】预选模式及相关逻辑
|
2021-09-24 18:38:58 +08:00 |
|
|
|
fdee0acd77
|
显示数据添加修订设备位置相关属性
|
2021-09-24 16:52:47 +08:00 |
|
|
|
4a70087c55
|
信号机添加显示方向字段
添加发布数据处理
|
2021-09-24 15:07:12 +08:00 |
|
|
|
3ef10fe8e5
|
修改移动授权equals条件
|
2021-09-23 17:12:24 +08:00 |
|
|
|
760dfb8ca7
|
Merge remote-tracking branch 'origin/test' into test
|
2021-09-23 14:37:37 +08:00 |
|
|
|
8ceba6ac01
|
删除无用字段和配置
|
2021-09-23 14:37:27 +08:00 |
|
|
|
4ab1703e1c
|
删除无效引用
|
2021-09-22 17:06:10 +08:00 |
|
|
|
2b036ead91
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-09-22 16:59:00 +08:00 |
|
|
|
2463a96204
|
真实IBP/PSL盘改为连接vrIBP/PSL（仅义乌项目）
|
2021-09-22 16:58:27 +08:00 |
|
|
|
14735fb16e
|
联锁检查添加新屏蔽门故障检查判断
|
2021-09-22 15:34:36 +08:00 |
|
|
|
3cb47d9577
|
修改因加载IBP数据导致的地图绘制数据无法保存的bug
|
2021-09-22 14:12:58 +08:00 |
|
|
|
1d60e2dd18
|
发送数据vo构建添加区段锁闭方向字段
|
2021-09-22 13:47:40 +08:00 |
|
|
|
e6c3127261
|
处理按计划行车报错
|
2021-09-22 11:22:00 +08:00 |
|
|
|
8c9c952973
|
机器人逻辑报错修改
|
2021-09-22 11:11:15 +08:00 |
|
|
|
1eb4bebb7a
|
添加信号机型号
修改信号机是否开放信号判断逻辑
|
2021-09-22 10:14:31 +08:00 |
|
|
|
3410967ce6
|
Merge remote-tracking branch 'origin/test' into test
|
2021-09-18 17:37:07 +08:00 |
|
|
|
ca6f5e01da
|
注销日志打印
|
2021-09-18 17:36:44 +08:00 |
|
|
|
4594fe6784
|
处理ARB故障导致进路解锁bug导致的列车EB问题
|
2021-09-18 17:36:04 +08:00 |
|
|
|
dcdcf652d0
|
真实设备配置继承；义乌项目配置类重命名
|
2021-09-18 15:31:17 +08:00 |
|
|
|
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 |
|
|
|
a2d0d1802f
|
修改虚拟PSL、IBP的加载时机；移除vrPsd中的屏蔽门控制级别相关字段，改为联锁实时根据vrPsl及vrIbp的状态判断
|
2021-09-18 14:36:29 +08:00 |
|
|
|
56ba88d2cd
|
信号机封锁后不能开信号
进路办理失败不取消锁闭
强制点灯操作修复
进路直接开放bug修改
|
2021-09-18 13:51:30 +08:00 |
|
|
|
b95af3b5b5
|
区段ARB预复位bug修改
|
2021-09-17 16:37:15 +08:00 |
|
|
|
09e72d1e7e
|
联锁信号控制——联锁条件不满足，控制信号机显示禁止信号，联锁条件满足时自动开放信号
信号机亮灯、灭灯控制改为联锁一直监控而非触发
修改道岔转动bug
|
2021-09-17 15:21:32 +08:00 |
|
|
|
1dfba0b3e5
|
仿真任务只处理本仿真的内容
|
2021-09-17 13:14:11 +08:00 |
|
|
|
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 |
|
|
|
097b32b500
|
取消进路操作不能取消转换轨进路
保护区段道岔锁闭位置不正确时不触发保护进路办理
修改延时解锁相关逻辑bug
|
2021-09-16 18:07:06 +08:00 |
|
|
|
7b287b9778
|
Merge remote-tracking branch 'origin/test' into test
|
2021-09-16 16:34:51 +08:00 |
|
|
|
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 |
|
|
|
00d17860f9
|
添加屏蔽门故障导致进路信号降级逻辑
|
2021-09-16 15:14:37 +08:00 |
|
|
|
849cfc59c3
|
添加进路延迟解锁逻辑
修改取消进路逻辑
|
2021-09-16 15:08:06 +08:00 |
|
|
|
2432cb904d
|
Merge remote-tracking branch 'origin/test' into test
|
2021-09-16 14:15:12 +08:00 |
|
|
|
2e6cb76639
|
联锁系统逻辑完善
信号机ctc下延续保护是否办理数据处理
|
2021-09-16 14:14:55 +08:00 |
|
Jade
|
aff00f1f08
|
车辆段联锁生成
|
2021-09-16 11:28:58 +08:00 |
|
|
|
1920204e33
|
虚拟真实设备初始化bug修改
|
2021-09-15 17:53:15 +08:00 |
|
|
|
2f64748166
|
Merge remote-tracking branch 'origin/test' into test
|
2021-09-15 17:37:47 +08:00 |
|
|
|
69aa300fed
|
联锁系统逻辑完善
|
2021-09-15 17:37:28 +08:00 |
|
|
|
5362e24d92
|
联锁系统逻辑完善
删除进路和延续保护的一些状态字段
|
2021-09-15 17:21:55 +08:00 |
|
|
|
1dcd1aec8a
|
添加清空用户草稿地图接口
|
2021-09-15 16:56:59 +08:00 |
|
|
|
061ed998fd
|
Merge remote-tracking branch 'origin/test' into ci-restruct
|
2021-09-15 11:00:36 +08:00 |
|
|
|
9ed066a000
|
清理repository无用方法
|
2021-09-15 10:52:46 +08:00 |
|
Jade
|
a8d47ee567
|
车辆段联锁生成
|
2021-09-14 17:26:49 +08:00 |
|
|
|
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 |
|
|
|
5664917d65
|
虚拟真实设备控制消息调整
车辆段调度角色调整
|
2021-09-14 17:09:15 +08:00 |
|
|
|
c2a00f26e9
|
修改小bug
|
2021-09-14 17:00:21 +08:00 |
|
|
|
8bb4617a5f
|
添加无logo项目枚举
|
2021-09-14 14:20:22 +08:00 |
|
|
|
5753f54874
|
Merge remote-tracking branch 'origin/test' into test
|
2021-09-14 12:43:50 +08:00 |
|
|
|
884a93a8fe
|
修改义乌IBP盘配置
|
2021-09-14 12:43:33 +08:00 |
|
|
|
b68db75959
|
Merge remote-tracking branch 'origin/test' into ci-restruct
|
2021-09-14 10:01:46 +08:00 |
|
|
|
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 |
|
|
|
9ab4d5a325
|
增加IBP、PSL、SIG控制屏蔽门的优先级逻辑；修改地图数据导入的bug
|
2021-09-13 19:14:42 +08:00 |
|
|
|
947223dab7
|
Merge remote-tracking branch 'origin/ci-restruct' into ci-restruct
|
2021-09-13 09:13:55 +08:00 |
|
|
|
7e3c5294fe
|
Merge remote-tracking branch 'origin/test' into ci-restruct
|
2021-09-13 09:13:30 +08:00 |
|
|
|
ce4eddfbdc
|
移动授权计算——未锁闭区段条件调整
连锁逻辑调整
|
2021-09-12 23:18:07 +08:00 |
|
|
|
c3a09a1b09
|
Merge remote-tracking branch 'origin/test' into test
|
2021-09-11 15:55:32 +08:00 |
|
|
|
3701b2df84
|
义乌项目真实设备联动
|
2021-09-11 15:55:16 +08:00 |
|
|
|
b723ae88d1
|
Merge remote-tracking branch 'origin/test' into ci-restruct
|
2021-09-10 18:15:36 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
3bc0ce321f
|
Merge remote-tracking branch 'origin/test' into ci-restruct
|
2021-09-06 14:25:40 +08:00 |
|
|
|
4c0ec909b0
|
添加工作站新类型：车辆段联锁工作站
map数据显示控制数据添加工作站类型字段
|
2021-09-06 14:24:22 +08:00 |
|
|
|
178a289126
|
进路办理重写
|
2021-09-06 10:50:59 +08:00 |
|
|
|
2cef80778a
|
先恢复旧字段相关逻辑（route和signal的）
|
2021-09-02 17:30:56 +08:00 |
|
|
|
085f7ba632
|
Merge remote-tracking branch 'origin/test' into ci-restruct
|
2021-09-02 16:54:36 +08:00 |
|
|
|
d5c2d5adfc
|
Merge branch 'master-huawei' into test
|
2021-09-02 16:47:58 +08:00 |
|
|
|
d5a446345c
|
添加中航锐创实训室项目枚举
修改实训生成仿真重置bug（之前为三维改成控制方式重置导致）
|
2021-09-02 16:33:10 +08:00 |
|
|
|
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 |
|
|
|
3ad5509840
|
修改道岔转动问题；增加列车调度操作
|
2021-08-30 18:11:54 +08:00 |
|
|
|
05b61765f5
|
Merge remote-tracking branch 'origin/test' into ci-restruct
|
2021-08-30 17:22:06 +08:00 |
|
|
|
5ae6ee8379
|
修改列车移动授权——反向锁闭区段作为移动授权终点bug修改
|
2021-08-30 17:20:38 +08:00 |
|
|
|
04be3cda30
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-08-30 17:10:55 +08:00 |
|
|
|
72c6ded4ec
|
Merge remote-tracking branch 'origin/test' into test
|
2021-08-30 17:09:11 +08:00 |
|
|
|
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 |
|
|
|
dd79e61150
|
Merge remote-tracking branch 'origin/test' into ci-restruct
|
2021-08-27 18:13:48 +08:00 |
|
|
|
1f63424ca1
|
信号机添加型号字段
进路添加信号显示字段
添加上面两个字段地图数据处理
添加联锁信号机和道岔新的采集逻辑
添加可控制虚拟真实设备抽象，实现信号机和道岔控制逻辑
|
2021-08-27 18:13:33 +08:00 |
|
|
|
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 |
|
|
|
b6a6bd1c89
|
修改获取仿真日志接口的实现；站台设置停站时间增加对列车设置停站时间功能
|
2021-08-26 16:11:41 +08:00 |
|
|
|
f90c678ced
|
修改MA为延续保护信号机，延续保护为逻辑区段导致EB问题
|
2021-08-25 16:43:30 +08:00 |
|
|
|
c362c47fcd
|
修改运行图相关数据导入导出逻辑
|
2021-08-25 16:20:18 +08:00 |
|
|
|
f7f6b4d77a
|
新增：通信车无法通过有通信车占用故障的区段
|
2021-08-25 15:30:32 +08:00 |
|
|
|
d9ff56069c
|
对无计轴占用的区段使用计轴预复位，会导致ARB故障
|
2021-08-24 17:36:25 +08:00 |
|
|
|
0fdc83b33e
|
添加<进路默认开启冲突检测>配置及逻辑
|
2021-08-24 16:58:14 +08:00 |
|
|
|
6c3ac11caa
|
修改站台轨限速判定；人工车处理站台跳停；联锁数据生成时给计轴区段偏移量赋值
|
2021-08-24 14:06:29 +08:00 |
|
|
|
27e2f456fc
|
速度曲线限速逻辑重写
|
2021-08-24 13:07:49 +08:00 |
|
|
|
3fbef78cb4
|
速度曲线计算限速逻辑重写（未测试）
|
2021-08-23 22:26:37 +08:00 |
|
|
|
3f05a36687
|
速度曲线限速逻辑重写（未完）
|
2021-08-23 18:23:47 +08:00 |
|
|
|
e4df304b10
|
修改bug：通信车与非通信车占用区段未隔开
|
2021-08-23 14:32:26 +08:00 |
|
|
|
96ab9cd256
|
修改非通信车占用区段
|
2021-08-23 13:12:45 +08:00 |
|
