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