|
|
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 |
|
|
|
aaf7582086
|
增加扬工院项目
|
2021-11-29 13:38:31 +08:00 |
|
|
|
fc6683c075
|
修改道岔故障（可恢复）枚举
|
2021-11-26 09:32:12 +08:00 |
|
|
|
bc2d84dfd0
|
Merge remote-tracking branch 'origin/test' into test
|
2021-11-26 09:25:58 +08:00 |
|
|
|
b7ea3007da
|
修改可恢复失表故障为1次恢复
|
2021-11-26 09:25:46 +08:00 |
|
Jade
|
cbd092b3c6
|
南京二 实训问题处理 岔心
|
2021-11-25 17:47:41 +08:00 |
|
|
|
b97969ab47
|
Merge remote-tracking branch 'origin/test' into test
|
2021-11-25 17:19:50 +08:00 |
|
|
|
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 |
|
|
|
5ac9c9ca41
|
Merge remote-tracking branch 'origin/test' into master-huawei
|
2021-11-25 12:10:47 +08:00 |
|
|
|
f7cb5fca15
|
仿真存储数据结构修改、补全
|
2021-11-25 10:06:00 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
