|
|
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 |
|
|
|
2ef600d906
|
修改屏蔽门故障设置流程以使三维同步
|
2021-08-23 09:56:37 +08:00 |
|
|
|
1e31cd0971
|
取消站台轨默认限速；列车在计轴故障区域不恢复通信
|
2021-08-20 16:51:50 +08:00 |
|
|
|
00c12177e2
|
站台轨默认限速44；修改机器人驾驶CM列车bug；交人工控时自动取消冲突检测
|
2021-08-20 14:47:44 +08:00 |
|
|
|
9ddcdeb5fd
|
计划车到达最后一站时判断折返的条件修改
|
2021-08-20 11:22:58 +08:00 |
|
|
|
fc9dfe8a8d
|
修改psl盘开关门逻辑
|
2021-08-20 10:48:29 +08:00 |
|
|
|
7f3b8b2792
|
修改设置头码车时路径选择bug；修改驾驶模式相关
|
2021-08-19 18:47:50 +08:00 |
|
|
|
3ef2b12939
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-08-19 18:09:37 +08:00 |
|
|
|
73b0de80da
|
列车接近导致信号机逻辑点灯时，关闭真实信号机；添加真实设备初始化时发送三维消息逻辑
|
2021-08-19 18:09:22 +08:00 |
|
|
|
de5bc4c4f2
|
Merge remote-tracking branch 'origin/test' into ci-restruct
|
2021-08-19 18:08:15 +08:00 |
|
|
|
ac59072e54
|
修改进路延续保护解锁后继续触发的bug
修改ATP区段占用逻辑bug
修改区段通信车占用故障问题
|
2021-08-19 18:08:01 +08:00 |
|
|
|
d668f21a1f
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-08-19 17:16:38 +08:00 |
|
|
|
1a057918b3
|
进路办理检查：道岔锁闭位置检查
|
2021-08-19 17:07:02 +08:00 |
|
|
|
29677120e3
|
修改车尾不确定位置为列车速度*2
|
2021-08-19 13:31:08 +08:00 |
|
|
|
368ff4bcd1
|
ats逻辑添加对站台折返策略的处理；修改折法进路办理逻辑；
|
2021-08-19 13:01:13 +08:00 |
|
|
|
6317c12f12
|
修改道岔区段获取下一运行区段bug
|
2021-08-19 11:01:58 +08:00 |
|
|
|
f66ef77efa
|
修改ATP占用问题
修改按计划行车列车加载逻辑
|
2021-08-19 10:34:36 +08:00 |
|
|
|
f1cb974e8c
|
删除ATS无用文件
修改ATP区段占用bug
|
2021-08-19 10:20:00 +08:00 |
|
|
|
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 |
|
|
|
fe85608e25
|
进路办理添加道岔征用检查和征用道岔逻辑,延续保护征用修改为动态征用，即若其他进路征用在相反位置，则不断尝试征用，直至成功征用再开始办理延续保护
列车扣车导致折返轨列车不发车问题修改
地面ATP清除区段占用bug修改
修改移动授权为前方列车时因eoa计算导致的后车EB问题
修改进路正常解锁特殊道岔征用未解锁导致的其他进路无法办理bug
联锁进路生成道岔筛选逻辑修改，同一计轴道岔的联动道岔也添加
|
2021-08-18 17:45:24 +08:00 |
|
|
|
acd66b6268
|
根据南京二操作修改区故解逻辑；
|
2021-08-18 15:58:29 +08:00 |
|
|
|
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 |
|
|
|
31a25aeeb9
|
修改获取下一方向区段逻辑——根据系统采集的道岔位置
|
2021-08-18 09:05:55 +08:00 |
|
|
|
4111b75d53
|
道岔区段查找下一运行区段逻辑bug修改
ATP区段占用逻辑修改，不确定距离增加至30m，占用判断逻辑调整
出库列车加载bug修改
|
2021-08-17 18:42:19 +08:00 |
|
|
|
725fcef2fd
|
运行图校验修改
仿真区段zc判断修改
|
2021-08-17 11:29:50 +08:00 |
|
|
|
1c2c00b303
|
全站设置联锁自动触发开、关、ats自动进路开、关逻辑修改；接收控制权操作逻辑修改
|
2021-08-17 10:47:50 +08:00 |
|
|
|
197819a417
|
修改默认停站时间、运行等级校验
|
2021-08-16 17:43:51 +08:00 |
|
|
|
8f80f34881
|
西安一号线周内周末运行图导入相关问题修改
|
2021-08-16 16:22:04 +08:00 |
|
|
|
fa4383cce6
|
通信车故障及恢复
|
2021-08-16 11:18:18 +08:00 |
|
|
|
4a35fbca0f
|
修改CTC列车MA计算时机，修改非通信车ATP占用判断问题
|
2021-08-13 18:14:29 +08:00 |
|
|
|
b1672f8abb
|
修改MA计算：EB触发安全长度改为20m，对于非通信车占用区段的EB触发距离计算改为到EOA距离
|
2021-08-13 15:07:33 +08:00 |
|
|
|
7c77d328ad
|
修改ATS进路触发：信号机存在非ATS自动控制的进路就不再触发此信号机为始端的进路
|
2021-08-13 14:39:26 +08:00 |
|
|
|
2a7d83d198
|
修改头码车默认运行时间
|
2021-08-12 18:14:00 +08:00 |
|
|
|
d99901c568
|
修改头码车更新计划区段bug
|
2021-08-12 18:09:25 +08:00 |
|
|
|
5618276a3a
|
修改ats进路触发时间限制
|
2021-08-12 17:33:06 +08:00 |
|
|
|
d070ca7005
|
修改ats进路触发时间限制
|
2021-08-12 17:16:38 +08:00 |
|
|
|
39cefc32d5
|
增加郑州共赢测试项目；修改ats进路触发时间限制
|
2021-08-12 16:54:12 +08:00 |
|
|
|
f576023194
|
Merge remote-tracking branch 'origin/test' into ci-restruct
|
2021-08-12 15:09:27 +08:00 |
|
|
|
6cd2d3bd2c
|
MA非通信车占用区段eoa位置计算逻辑bug修改，MA计算迭代次数调整
ITC移动授权计算添加atpOn条件
非CTC进路办理流程延续保护逻辑bug修改
|
2021-08-12 15:09:11 +08:00 |
|
|
|
9bf2b2ded6
|
增加<回库>指令；非计划车不会自动回库；设置头码车时会清空ats待触发进路；设置头码车时会更新计划区段；
|
2021-08-12 15:04:49 +08:00 |
|
|
|
8d217cfae1
|
MA计算逻辑修改，取移动授权距离最近的作为结束
修改列车EB更新制动力问题
|
2021-08-12 11:30:06 +08:00 |
|
|
|
2a6b0bebe1
|
修改设置计划车时更新车站计划的逻辑
|
2021-08-11 19:02:49 +08:00 |
|
|
|
3e4a0d1332
|
改为人工车时重置速度上线；进路排列时检查岔心
|
2021-08-11 18:27:48 +08:00 |
|
|
|
2ad59b8f7c
|
处理列车更新目标区段问题
|
2021-08-11 18:13:15 +08:00 |
|
|
|
8968d2c46d
|
列车更新目标区段bug修改
|
2021-08-11 17:18:33 +08:00 |
|
|
|
42d1952ef4
|
提前发车操作逻辑修改
列车更新目标区段添加限制
添加列车ato动车扣车检查
|
2021-08-11 16:52:59 +08:00 |
|
|
|
c4cc217cd3
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-08-11 14:56:35 +08:00 |
|
|
|
39bb108a64
|
修改生成默认课程bug；修改备用车设置为头码车不运行bug；未按计划行车时不再将转换轨的人工车替换成即将出库的计划车；修改<设置自动触发/ats自排时信号机需处于人工控>设置的判定bug；列车应用新计划时清除未触发的进路；修改列车更新目标区段逻辑；
|
2021-08-11 14:54:32 +08:00 |
|
|
|
f3293c93d7
|
延续保护解锁侧防解锁逻辑问题修改
|
2021-08-11 11:20:54 +08:00 |
|
|
|
b431e382a5
|
修改设置计划车bug
|
2021-08-10 20:42:58 +08:00 |
|
|
|
ef79a3abf0
|
修改target更新逻辑；修改设置计划车bug；修改计轴故障时进路不能解锁问题
|
2021-08-10 20:24:48 +08:00 |
|
|
|
c557d118a6
|
修改头码车运行时仿真异常的问题（因为没有运行等级/停站时间数据，现在添加了对这两个数据的简单校验）；人工车有进路就能运行
|
2021-08-10 16:09:10 +08:00 |
|
|
|
b86308f88a
|
取消应答器数据校验
|
2021-08-10 13:16:47 +08:00 |
|
|
|
c7b63cfacc
|
地图发布创建默认交路时，数据检查不通过时，不再报错，仅取消创建交路
|
2021-08-10 10:11:09 +08:00 |
|
|
|
9e39ee5a93
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-08-09 16:46:20 +08:00 |
|
|
|
44d3166858
|
修改进路触发逻辑；列车在转换轨停车时，增加检查回库的逻辑
|
2021-08-09 16:46:05 +08:00 |
|
|
|
631324c2c7
|
ato逻辑无速度曲线判断
|
2021-08-09 14:45:55 +08:00 |
|
|
|
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 |
|
|
|
884b312623
|
列车ITC级别运行相关逻辑完善
|
2021-08-09 14:28:07 +08:00 |
|
|
|
05d585e37e
|
修改进路筛选bug；修改ma计算bug；修改ats监控列车的通信判定
|
2021-08-09 13:59:04 +08:00 |
|
|
|
38da1d716c
|
列车ITC级别运行相关逻辑实现
|
2021-08-06 18:12:54 +08:00 |
|
|
|
6f76ea4df7
|
处理无折返策略数据导致的bug
|
2021-08-06 18:00:52 +08:00 |
|
|
|
6cadfcf607
|
hmi消息增加牵引/制动力比例
|
2021-08-06 16:32:33 +08:00 |
|
|
|
6dee8dfa31
|
多点登录被登出后发送socket消息；ARB故障在有非通信车接近时改为计轴故障
|
2021-08-06 14:21:03 +08:00 |
|
|
|
3607e9ebe2
|
进路设置自动通过后，无法使用取消进路操作；从发布地图创建草稿增加超限区段数据
|
2021-08-06 10:22:47 +08:00 |
|
|
|
5c2a94161a
|
bug
|
2021-08-05 18:49:48 +08:00 |
|
|
|
afbaf5debc
|
Merge remote-tracking branch 'origin/ats-restruct' into ats-restruct
|
2021-08-05 18:38:14 +08:00 |
|
|
|
5570eac3e4
|
进路超限区段数据构建，逻辑实现
|
2021-08-05 18:37:55 +08:00 |
|
|
|
3af6b866ab
|
Merge remote-tracking branch 'origin/ats-restruct' into ats-restruct
|
2021-08-05 17:41:02 +08:00 |
|
|
|
405b2368f9
|
列车终点站跳停逻辑修改
|
2021-08-05 17:40:39 +08:00 |
|
|
|
534c014bb1
|
修改ATO逻辑；增加处理地图草稿数据接口
|
2021-08-05 16:18:26 +08:00 |
|
|
|
3e16198215
|
修改新版ma计算；恢复ATO到站自动开门后关闭ATO逻辑
|
2021-08-05 13:48:46 +08:00 |
|
|
|
43274b5511
|
修改扣车bug
|
2021-08-05 10:03:07 +08:00 |
|
|
|
334d4ec105
|
增加创建超限区段接口、进路数据关联超限区段
|
2021-08-05 09:52:47 +08:00 |
|
|
|
8e58d6ba89
|
设置头码车路径寻找逻辑修改
|
2021-08-05 09:51:35 +08:00 |
|
|
|
3d712e6486
|
修改新ATS中的bug；取消进路功能不再取消自动通过状态
|
2021-08-04 18:02:36 +08:00 |
|
|
|
e0c7ad2150
|
Merge remote-tracking branch 'origin/ats-restruct' into ats-restruct
|
2021-08-04 15:16:20 +08:00 |
|
|
|
d6ba9cd5cf
|
取消进路功能不能取消通过进路
|
2021-08-04 15:12:05 +08:00 |
|
|
|
77459e2a98
|
列车跳停bug修改
|
2021-08-04 09:37:12 +08:00 |
|
|
|
1f6b77b26a
|
MA计算ato距离逻辑调整
|
2021-08-03 18:34:13 +08:00 |
|
|
|
a3634dda76
|
新版ATS进路选择bug修改；头码车计划区段更新逻辑修改；
|
2021-08-03 16:58:24 +08:00 |
|
|
|
eb5d355485
|
Merge remote-tracking branch 'origin/ats-restruct' into ats-restruct
|
2021-08-03 15:47:02 +08:00 |
|
|
|
83f5ada9f3
|
仿真ats重构-修改服务端口
|
2021-08-03 14:13:19 +08:00 |
|
|
|
c825bd92aa
|
Merge remote-tracking branch 'origin/test' into ats-restruct
|
2021-08-03 13:59:01 +08:00 |
|
|
|
0296d007ab
|
设置人工车时，列车在停止状态下才清除target；添加创建进路接口；列车最大速度降低至80km/h
|
2021-08-03 13:58:39 +08:00 |
|
|
|
653a29eb65
|
仿真ats重构-MA移动授权逻辑重构，ATS进路触发逻辑调整，进路正常开始解锁逻辑判断流程调整（现根据进路第一区段占用情况触发）
|
2021-08-03 13:53:49 +08:00 |
|
|
|
670ed1163a
|
新版ATS进路选择修改
|
2021-08-02 16:22:08 +08:00 |
|
|
|
6840372770
|
区段计轴故障流程修改；设置互锁解除时重开信号机
|
2021-08-02 11:22:05 +08:00 |
|
|
|
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 |
|
|
|
0a989ab9e2
|
新版ATS进路选择修改
|
2021-08-02 09:40:52 +08:00 |
|
|
|
8fc7e34e65
|
防护速度改为推荐速度+5km/h
|
2021-08-01 19:41:32 +08:00 |
|
|
|
6f0a60a3ea
|
hmi添加字段；计算速度曲线逻辑迁移至ATP循环；ATP速度防护逻辑修改
|
2021-07-30 19:06:45 +08:00 |
|
|
|
833d2ecb6e
|
列车进站停车开门后关闭ATO；非通信车开关车门不联动站台门；列车三维状态数据增加字段
|
2021-07-30 16:59:14 +08:00 |
|
|
|
6d7bb118ae
|
修改进路区段限速判断
|
2021-07-29 17:31:32 +08:00 |
|
|
|
1fd9d1230c
|
添加逻辑：为非通信车办理的进路，如果有区段限速，信号无法开启
|
2021-07-29 16:55:19 +08:00 |
|
|
|
f4a5037de3
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-07-29 15:20:00 +08:00 |
|
|
|
988bed827d
|
修改备用车无法ATO驾驶（zc去掉未锁闭进路检查）、不停站问题
|
2021-07-29 15:19:51 +08:00 |
|
|
|
f078ad99dd
|
修改移动授权对非通信车占用的判定；修改驾驶模式切换bug
|
2021-07-29 14:05:09 +08:00 |
|
|
|
456897fd78
|
仿真抽象——仿真运行逻辑控制不同步执行bug修改
|
2021-07-29 13:33:46 +08:00 |
|
|
|
d6011b5395
|
修改移动授权对非通信车占用的判定；修改切SM驾驶模式bug
|
2021-07-29 10:11:45 +08:00 |
|
|
|
0a7b17bee2
|
修改列车驾驶模式切换、区段占用判断、移动授权计算逻辑
|
2021-07-28 18:05:57 +08:00 |
|
|
|
da58bce36c
|
现地显示配置增加字段
|
2021-07-28 17:00:34 +08:00 |
|
|
|
55251a833e
|
小bug
|
2021-07-27 18:10:28 +08:00 |
|
|
|
eaabfd124e
|
修改屏蔽门相关psl盘状态、ats状态、移动授权计算
|
2021-07-27 18:01:55 +08:00 |
|
|
|
bbd36ea889
|
修改非CTC进路的联锁检查逻辑
|
2021-07-27 17:41:23 +08:00 |
|
|
|
239c3c9f08
|
修改<越红灯><确认运行至前方站>指令对驾驶模式的限制
|
2021-07-27 14:20:36 +08:00 |
|
|
|
4d3e7b8735
|
Merge remote-tracking branch 'origin/test' into ats-restruct
|
2021-07-27 14:12:07 +08:00 |
|
|
|
148baa1b4f
|
Merge remote-tracking branch 'origin/test' into ats-restruct
|
2021-07-27 14:06:20 +08:00 |
|
|
|
ed421e0650
|
新增：转CM前更新CBTC移动授权；
修改：CBTC移动授权对车头区段非通信车占用的判定
|
2021-07-27 13:50:46 +08:00 |
|
|
|
4438009ccd
|
移除EB时不能开启ATO的逻辑；移除EB且未停车时不更新ma的逻辑
|
2021-07-27 10:09:31 +08:00 |
|
|
|
fdf1638e73
|
添加<突然EB>故障；RM模式不丢失定位
|
2021-07-26 18:23:05 +08:00 |
|
|
|
ca1a13c715
|
Merge remote-tracking branch 'origin/ats-restruct' into ats-restruct
|
2021-07-26 14:09:07 +08:00 |
|
|
|
b4776ffaa3
|
修改新版ATS进路排列逻辑
|
2021-07-26 14:08:52 +08:00 |
|
|
|
63da590542
|
修改停站流程
|
2021-07-26 10:55:47 +08:00 |
|
|
|
7141285039
|
仿真ats重构-ats触发进路不触发存在联锁自动触发或联锁自动进路的始端信号机
|
2021-07-23 16:10:09 +08:00 |
|
|
|
8059408d96
|
仿真ats重构-添加为列车更新目的区段逻辑，修改计划车折返进路办理bug，修改信号机接近区段判断bug，添加进路非ATS自动控相关逻辑
|
2021-07-23 14:57:07 +08:00 |
|
|
|
02924c0cb5
|
Merge remote-tracking branch 'origin/ats-restruct' into ats-restruct
|
2021-07-23 11:09:12 +08:00 |
|
|
|
0f23c27b3b
|
修改列车停站处理逻辑
|
2021-07-23 11:08:57 +08:00 |
|
|
|
450c33ea74
|
仿真ats重构-进路冲突检查字段回传
|
2021-07-23 09:29:12 +08:00 |
|
|
|
edb3a43cb5
|
仿真ats重构-ATS进路冲突检查逻辑调整，进路冲突处理流程完善
|
2021-07-22 17:36:16 +08:00 |
|
|
|
b94f90ce17
|
仿真ats重构-ATS进路冲突检查流程开发（告警方式实现）
|
2021-07-21 15:40:06 +08:00 |
|
|
|
4ea0ad5e1f
|
修改：新版头码车进路办理bug
|
2021-07-21 11:17:58 +08:00 |
|
|
|
b37cc7d631
|
修改：非通信车停站站台设置扣车不再关闭信号机
|
2021-07-20 17:30:48 +08:00 |
|
|
|
0bb8289352
|
Merge remote-tracking branch 'origin/test' into simulation-new-logic
|
2021-07-20 16:43:57 +08:00 |
|
|
|
46b9a06299
|
添加电路草稿相关数据管理接口
修改区段进路解锁方法参数和逻辑
|
2021-07-20 16:43:41 +08:00 |
|
|
|
bef8add983
|
修改：道岔区段故障占用时进路仍能办理的bug
|
2021-07-20 16:02:27 +08:00 |
|
|
|
6afa297947
|
修改：回滚配置文件
|
2021-07-20 15:24:31 +08:00 |
|
|
|
ec0b05323c
|
修改：进路区段故障占用时无法办理
修改：删除扣车批量操作bug
|
2021-07-20 15:14:41 +08:00 |
|
|
|
f8a42de456
|
仿真ats重构-ATS触发列车进路办理添加进路中调头列车检查逻辑，触发进路问题修改，ZC锁闭进路逻辑重新打开
|
2021-07-20 14:49:51 +08:00 |
|
|
|
bc5b95df5f
|
修改：进路延续保护在CTC模式下是否需要办理作为数据
|
2021-07-20 13:52:05 +08:00 |
|
|
|
1ae1ab6a27
|
Merge remote-tracking branch 'origin/test' into ats-restruct
|
2021-07-19 16:44:57 +08:00 |
|
|
|
a7e98da3af
|
修改：前方列车移动授权计算bug
修改：修改进路锁闭移动授权判定逻辑（为了让列车调头后前方进路未排列时不动车）
修改：进路办理失败时不从settingRouteMap移除（西安三问题）
|
2021-07-19 16:39:17 +08:00 |
|
|
|
9df1c00929
|
仿真ats重构-ATS触发计划车进路逻辑修改（计划时间前50s才选进路），添加冲突检测相关状态和逻辑
|
2021-07-19 16:01:09 +08:00 |
|
|
|
f1451d1f12
|
新增：进路数据处理接口（standHoldList）
|
2021-07-19 13:11:52 +08:00 |
|
|
|
6c1c8d1b43
|
修改：进路办理检查内容（自动进路）
新增：<进路联锁不包含站台扣车>联锁配置及相关逻辑
|
2021-07-19 11:11:41 +08:00 |
|
|
|
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 |
|
|
|
d68d836aa5
|
Merge remote-tracking branch 'origin/ats-restruct' into ats-restruct
|
2021-07-19 09:40:59 +08:00 |
|
|
|
f70c7a51c6
|
修改：移动授权计算bug
|
2021-07-16 22:49:26 +08:00 |
|
|
|
321b4d2b4c
|
修改：前方列车移动授权计算bug
|
2021-07-16 21:57:42 +08:00 |
|
|
|
2793d56431
|
新版头码车逻辑修改（未完）
|
2021-07-16 18:26:01 +08:00 |
|
|
|
08068ebf21
|
修改：ma为null导致的bug
|
2021-07-16 17:12:06 +08:00 |
|
|
|
ce176c1035
|
回滚：添加计划接口
|
2021-07-16 17:05:43 +08:00 |
|
|
|
288dc92579
|
新增：<无关闭锁紧信号>故障
|
2021-07-16 16:43:41 +08:00 |
|
|
|
8df4df4c0f
|
修改：扣车不再影响站台/列车正常关门
|
2021-07-16 11:17:22 +08:00 |
|
|
|
341a8a92bb
|
修改：设置联锁自动触发不再关闭进路自动控（ats进路自动触发逻辑对应修改）
|
2021-07-16 11:16:43 +08:00 |
|
|
|
86dce84b28
|
修改：移动授权计算bug
|
2021-07-16 09:15:19 +08:00 |
|
|
|
8e06b39322
|
Merge remote-tracking branch 'origin/test' into ats-restruct
|
2021-07-15 16:37:14 +08:00 |
|
|
|
645a06cec4
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-07-15 16:35:18 +08:00 |
|
|
|
2ea4672f00
|
修改：移动授权计算bug
|
2021-07-15 16:35:09 +08:00 |
|
|
|
921358002c
|
Merge remote-tracking branch 'origin/test' into ats-restruct
|
2021-07-15 16:29:48 +08:00 |
|
|
|
2d4b40cdb5
|
仿真ats重构-修改车载更新下一计划接口，修改区段进路解锁和延续保护解锁锁闭方向bug，修改CI运行频率为1s
|
2021-07-15 15:03:45 +08:00 |
|
|
|
2b61795f09
|
仿真ats重构-修改进路排列bug，修改获取下一车次计划bug，修改停站时间判断bug
|
2021-07-15 14:07:12 +08:00 |
|
|
|
7eb15b6ad8
|
添加2d模型历史版本分页查询接口
|
2021-07-15 10:56:47 +08:00 |
|
|
|
8ba8d915dc
|
Merge remote-tracking branch 'origin/test' into simulation-new-logic
|
2021-07-15 09:56:13 +08:00 |
|
|
|
d5f0672a57
|
添加郑州共赢小程序配置和登录接口等
添加2d模型历史版本相关接口
|
2021-07-15 09:55:55 +08:00 |
|
|
|
9aa9dc6035
|
头码车逻辑
|
2021-07-15 09:55:40 +08:00 |
|
|
|
f629002d95
|
新增：显示配置
|
2021-07-14 09:37:08 +08:00 |
|
|
|
d8426a5d2d
|
仿真ats重构-列车车载站台逻辑控制bug修改，移动授权距离调整，进路路径区段排序构建bug修改，ATS计划车冲突判断bug修改，计划车更新车次计划未同步到列车车载bug修改
|
2021-07-13 18:21:37 +08:00 |
|
|
|
9e7148525b
|
仿真ats重构-进路区段解锁逻辑修改
|
2021-07-13 15:42:46 +08:00 |
|
|
|
cea1f6de3b
|
Merge remote-tracking branch 'origin/test' into ats-restruct
|
2021-07-13 15:05:17 +08:00 |
|
|
|
1b5a6cc68e
|
修改：前方列车的移动授权计算
|
2021-07-13 14:58:15 +08:00 |
|
|
|
cecfcb1f57
|
Merge remote-tracking branch 'origin/test' into ats-restruct
|
2021-07-13 13:32:56 +08:00 |
|
|
|
9a25867812
|
修改：移动授权计算
|
2021-07-13 13:01:51 +08:00 |
|
|
|
064f64a1ee
|
仿真ats重构-ATS计划车进路触发逻辑调整
|
2021-07-13 11:05:38 +08:00 |
|
|
|
8612c012a9
|
Merge remote-tracking branch 'origin/test' into ats-restruct
|
2021-07-13 10:49:36 +08:00 |
|
|
|
5b1603cca4
|
修改：移动授权计算
|
2021-07-13 10:32:33 +08:00 |
|
|
|
84a47d6183
|
Merge remote-tracking branch 'origin/test' into ats-restruct
|
2021-07-12 17:25:26 +08:00 |
|
|
|
d78c1db2d8
|
仿真ats重构
|
2021-07-12 17:25:17 +08:00 |
|
|
|
792263361e
|
修改：道岔进路/延续保护锁闭并失表时才计算移动授权
|
2021-07-12 17:11:50 +08:00 |
|
|
|
5d61e74415
|
IBP盘bug修改
|
2021-07-12 14:30:30 +08:00 |
|
|
|
a48e863898
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-07-09 10:45:52 +08:00 |
|
|
|
94105ddd88
|
Merge remote-tracking branch 'origin/test' into simulation-ATS-restruct
|
2021-07-08 17:46:33 +08:00 |
|
|
|
afa4228e94
|
仿真ats重构
|
2021-07-08 17:46:13 +08:00 |
|
|
|
30fcdeab8f
|
Merge remote-tracking branch 'origin/test' into simulation-new-logic
|
2021-07-08 15:38:03 +08:00 |
|
|
|
9105e2cb44
|
调试修改2d模型操作相关接口
修改仿真记录bug
修改第三方同步问题
|
2021-07-08 15:37:40 +08:00 |
|
|
|
6137c977bc
|
修改：开关门指令无效bug
|
2021-07-08 15:07:53 +08:00 |
|
|
|
8faf1c9886
|
新增：IBP盘关门按钮；PSL盘关闭且紧锁指示灯
|
2021-07-08 14:44:18 +08:00 |
|
|
|
6a91cfe698
|
Merge remote-tracking branch 'origin/test' into simulation-ATS-restruct
|
2021-07-07 18:07:52 +08:00 |
|
|
|
cec67bc20b
|
修改：设置头码车时的车次校验
|
2021-07-07 18:03:19 +08:00 |
|
|
|
8daaf8743d
|
Merge remote-tracking branch 'origin/test' into simulation-ATS-restruct
|
2021-07-07 17:43:11 +08:00 |
|
|
|
65066fe38f
|
修改：道岔相关移动授权计算
|
2021-07-07 16:24:37 +08:00 |
|
|
|
d76f37c2b0
|
Merge remote-tracking branch 'origin/test' into simulation-ATS-restruct
|
2021-07-07 15:21:20 +08:00 |
|
|
|
85091f8af6
|
修改：IBP盘试灯按钮逻辑修改
|
2021-07-07 11:07:00 +08:00 |
|
|
|
4a39c9bf89
|
修改：进路相关移动授权计算bug
|
2021-07-07 11:02:22 +08:00 |
|
|
|
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 |
|
|
|
679b5012b3
|
修改：进路相关移动授权计算
|
2021-07-07 09:52:51 +08:00 |
|
|
|
6edd259ca7
|
修改：ATO及机器人驾驶逻辑
|
2021-07-06 17:52:50 +08:00 |
|
|
|
910f7a359b
|
修改：进路相关移动授权计算
|
2021-07-06 15:52:33 +08:00 |
|
|
|
73b34bca1d
|
修改：设置人工车逻辑；ATO运行逻辑
|
2021-07-06 15:10:48 +08:00 |
|
|
|
92c572fad4
|
修改：运行图初始化bug
|
2021-07-06 11:28:43 +08:00 |
|
|
|
e98bb1a9b7
|
Merge remote-tracking branch 'origin/test' into simulation-ATS-restruct
|
2021-07-06 11:18:21 +08:00 |
|
|
|
2ddb1c38c5
|
修改：有关进路的移动授权计算逻辑bug
|
2021-07-06 11:13:56 +08:00 |
|
|
|
5bb62daef0
|
修改：头码车进路选择逻辑
|
2021-07-06 09:51:26 +08:00 |
|
|
|
34118c2732
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-07-06 09:26:58 +08:00 |
|
|
|
bfb41bc0bb
|
新增：加线抽线的初始化逻辑；查询车次计划时过滤掉删除的计划
|
2021-07-06 09:26:45 +08:00 |
|
|
|
f25c5fd5f1
|
修改：换端操作不再关闭ATO；进路相关移动授权计算
|
2021-07-06 09:24:59 +08:00 |
|
|
|
35d6139ed6
|
新增：头码车到终点变人工车（线路配置）
|
2021-07-05 17:41:22 +08:00 |
|
|
|
8099ee57e9
|
修改：非通信车占用判定
|
2021-07-05 17:12:53 +08:00 |
|
|
|
2781568f82
|
修改：非通信车占用判定bug
|
2021-07-05 16:55:17 +08:00 |
|
|
|
b0bfe7bcc3
|
新增：登录增加参数（成工业）
|
2021-07-05 16:18:02 +08:00 |
|
|
|
a93df56e55
|
新增：进路排列增加道岔占用检查
|
2021-07-05 16:15:33 +08:00 |
|
|
|
343ce12cea
|
修改：计轴故障bug
|
2021-07-05 16:14:38 +08:00 |
|
|
|
b4b5be759f
|
修改仿真仓库运行图空指针bug
|
2021-07-05 15:30:56 +08:00 |
|
|
|
889f45fe40
|
新增：列车所在进路道岔位置不正确会导致EB
|
2021-07-05 13:16:35 +08:00 |
|
|
|
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 |
|
|
|
ee1afdb699
|
仿真ats重构
|
2021-07-02 18:47:53 +08:00 |
|
|
|
9468e2848b
|
新增：运行图加线、抽线功能（西铁院）
|
2021-07-02 13:40:26 +08:00 |
|
|
|
517f6bb536
|
新增：信号机延续保护状态（前端信号机编号显示蓝色）（西安三53）
|
2021-07-02 13:26:02 +08:00 |
|
|
|
39c8eab5c2
|
新增：线路配置<转换轨进路只能通过区故解取消>（西安三52）
|
2021-07-02 11:18:57 +08:00 |
|
|
|
d335982687
|
修改：延续保护解锁逻辑（西安三49）
|
2021-07-02 09:18:17 +08:00 |
|
|
|
7119fad066
|
修改：列车升降级逻辑（因取消通信故障后会直接升级CBTC）
|
2021-07-01 17:20:33 +08:00 |
|
|
|
d83a076f14
|
修改：ARB故障逻辑
|
2021-07-01 15:27:59 +08:00 |
|
|
|
6c6da7560d
|
修改：列车信息更新折返策略报错bug
|
2021-06-30 18:05:09 +08:00 |
|
|
|
8d74fe84b1
|
修改：IBP盘试灯按钮bug
|
2021-06-30 17:27:45 +08:00 |
|
|
|
9e88dcef49
|
新增：列车加载时更新折返策略和折返状态
|
2021-06-30 17:11:30 +08:00 |
|
|
|
ebc45fdfee
|
新增：线路配置<设置头码车时检查方向>及逻辑
|
2021-06-30 17:10:39 +08:00 |
|
|
|
ffbb75ea4d
|
新增：StandStatus增加折返策略
|
2021-06-30 15:18:54 +08:00 |
|
|
|
18fbefcee7
|
修改：列车信息添加内容（西安三47）
|
2021-06-30 13:53:44 +08:00 |
|
|
|
f04cb9ae19
|
修改连挂时的列车逻辑；
|
2021-06-30 13:52:06 +08:00 |
|
|
|
d7c5e7cd32
|
修改：IBP盘部分功能实现
|
2021-06-30 13:03:16 +08:00 |
|
|
|
62027d50ee
|
修改：列车在第一站跳停无效bug（西安三46）
|
2021-06-30 09:32:18 +08:00 |
|
|
|
af25264080
|
修改：IBP盘bug
|
2021-06-29 18:02:06 +08:00 |
|
|
|
def44e9db2
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-06-28 17:38:46 +08:00 |
|
|
|
0ee231475a
|
修改：列车信息添加内容（西安三47）（未完）
|
2021-06-28 17:35:37 +08:00 |
|
|
|
88dad9cee4
|
Merge remote-tracking branch 'origin/test' into NTY-simulation
|
2021-06-25 18:44:04 +08:00 |
|
|
|
378f6f43f4
|
仿真ats重构
|
2021-06-25 18:43:45 +08:00 |
|
|
|
588db159e0
|
修改：讯飞语音识别关闭动态修正
|
2021-06-25 15:07:52 +08:00 |
|
|
|
2454d53a5e
|
修改：剧本转换驾驶模式bug
|
2021-06-25 11:21:44 +08:00 |
|
|
|
10b6ebc3c2
|
Merge remote-tracking branch 'origin/test' into NTY-simulation
|
2021-06-24 18:58:11 +08:00 |
|
|
|
f225f67e4b
|
压力测试仿真不记录仿真时长
|
2021-06-24 18:57:59 +08:00 |
|
|
|
77c133cb7a
|
修改列车降级bug
|
2021-06-24 18:43:54 +08:00 |
|
|
|
94d5f4a4ef
|
添加仿真压力测试接口
|
2021-06-24 18:06:21 +08:00 |
|
|
|
1b1eadb370
|
站台设置折返策略操作逻辑
|
2021-06-24 16:47:45 +08:00 |
|
|
|
7ef0be2c82
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-06-24 14:02:09 +08:00 |
|
|
|
0d44bfcab3
|
ZC增加<无服务>属性
|
2021-06-24 14:02:00 +08:00 |
|
|
|
0cbac09abb
|
修改列车升级逻辑
|
2021-06-24 14:00:53 +08:00 |
|
|
|
cd0abf3f74
|
添加项目枚举
|
2021-06-24 11:26:15 +08:00 |
|
|
|
7a3bea2fee
|
Merge branch 'test' into dev
|
2021-06-23 18:48:18 +08:00 |
|
|
|
be456adf6c
|
修改ITC移动授权发送方式（通过应答器）
|
2021-06-23 18:47:54 +08:00 |
|
|
|
8d275849a1
|
Merge remote-tracking branch 'origin/test' into wechat-micro2-login
|
2021-06-23 18:26:06 +08:00 |
|
|
|
80e3d237bc
|
添加第三方配置管理功能
添加第三方用户仿真时长、用户考试结果同步流程
|
2021-06-23 18:25:43 +08:00 |
|
|
|
d22c6f83cd
|
修改列车升级逻辑（兼容应答器）
|
2021-06-23 17:30:08 +08:00 |
|
|
|
2eee85699e
|
Merge branch 'test' into dev
|
2021-06-23 16:04:28 +08:00 |
|
|
|
3bcae4a6b8
|
ZC增加<管理的区段>字段及相关逻辑
|
2021-06-23 16:04:15 +08:00 |
|
|
|
5c98d52006
|
修改移动授权丢失计时bug
|
2021-06-23 14:15:20 +08:00 |
|
|
|
a949f78450
|
列车初始化增加内容
|
2021-06-23 14:10:58 +08:00 |
|
|
|
4bf6f3fd5e
|
修改仿真数据校验bug
|
2021-06-23 13:37:08 +08:00 |
|
|
|
757bd9d497
|
Merge remote-tracking branch 'origin/test' into wechat-micro2-login
|
2021-06-23 10:44:07 +08:00 |
|
|
|
a5df50e114
|
添加2d模型数据管理接口调整
更新sql
|
2021-06-23 10:43:38 +08:00 |
|
|
|
8f55119b8b
|
添加2d模型草稿发布接口
添加2d模型数据管理接口
|
2021-06-23 10:39:51 +08:00 |
|
|
|
12a82c7dca
|
修改列车加载bug；修改速度曲线计算bug
|
2021-06-23 10:32:23 +08:00 |
|
|
|
427299528f
|
Merge remote-tracking branch 'origin/test' into wechat-micro2-login
|
2021-06-22 17:46:26 +08:00 |
|
|
|
65b7c6f9b1
|
地图数据——道岔添加型号字段
|
2021-06-22 17:46:07 +08:00 |
|
|
|
602ff1df1e
|
Merge branch 'test' into dev
|
2021-06-22 13:08:54 +08:00 |
|
|
|
2c3fda7dcf
|
修改ZC移动授权计算bug
|
2021-06-22 13:08:36 +08:00 |
|
|
|
7de1fd64ad
|
Merge remote-tracking branch 'origin/test' into wechat-micro2-login
|
2021-06-22 11:26:26 +08:00 |
|
|
|
48ae6734ff
|
smart-doc相关配置调整，可由项目访问
|
2021-06-22 11:26:13 +08:00 |
|
|
|
9a206457fe
|
Merge branch 'test' into dev
|
2021-06-22 10:46:55 +08:00 |
|
|
|
d741b550fb
|
仿真对话改用讯飞语音识别
|
2021-06-22 10:45:43 +08:00 |
|
|
|
e720603455
|
实现ARB计轴预复位逻辑
|
2021-06-22 10:42:26 +08:00 |
|
|
|
b55e81edec
|
增加车次发音匹配内容
|
2021-06-21 16:56:43 +08:00 |
|
|
|
5a68971025
|
修改：讯飞语音识别实现
|
2021-06-21 16:17:46 +08:00 |
|
|
|
e8373fc6e6
|
Merge remote-tracking branch 'origin/test' into wechat-micro2-login
|
2021-06-21 15:49:51 +08:00 |
|
|
|
eb16909a52
|
删除swagger依赖，将swagger注解替换为Java注释，引入smart-doc的maven插件，可以生成Rest接口的doc文档
添加2d模型草稿增删改查接口和实现
|
2021-06-21 15:49:30 +08:00 |
|
|
|
7558c10420
|
修改：区段进路解锁时不再对区段延续保护解锁
|
2021-06-21 15:45:17 +08:00 |
|
|
|
d350f15260
|
修改：IBP盘蜂鸣器bug
|
2021-06-21 14:17:19 +08:00 |
|
|
|
2339952cae
|
新增：设置ARB故障
|
2021-06-21 13:53:03 +08:00 |
|
|
|
eddd0171b7
|
Revert "修改：恢复ARB判定。 新增：<无ARB判定>线路配置"
This reverts commit dce0f88e
|
2021-06-21 09:36:44 +08:00 |
|
|
|
dce0f88ec4
|
修改：恢复ARB判定。
新增：<无ARB判定>线路配置
|
2021-06-18 15:15:36 +08:00 |
|
|
|
47bf98e80d
|
修改：IBP盘逻辑及数据
|
2021-06-18 15:13:59 +08:00 |
|
|
|
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 |
|
|
|
0493597a92
|
Merge remote-tracking branch 'origin/test' into test
|
2021-06-17 18:01:59 +08:00 |
|
|
|
8deff874d7
|
修改：IBP盘循环逻辑增加try-catch
|
2021-06-17 18:01:45 +08:00 |
|
|
|
df508e3509
|
取消旧仿真定时销毁仿真任务，新定时兼容所有仿真定时删除逻辑
仿真vo查询接口调整
|
2021-06-17 17:56:56 +08:00 |
|
|
|
737edb9889
|
修改：IBP盘bug
|
2021-06-17 17:53:17 +08:00 |
|
|
|
a6c43d601d
|
新仿真——添加定时任务：所有用户都不再订阅时销毁仿真
|
2021-06-17 16:17:41 +08:00 |
|
|
|
f7529fa7f0
|
列车运行控制——摩擦阻力计算修改
|
2021-06-17 15:28:52 +08:00 |
|
|
|
3639ea5a2f
|
列车运行控制——修改列车最高速度为350km/h
新仿真逻辑——修改加载运行计划bug
|
2021-06-17 15:27:53 +08:00 |
|
|
|
e51130b690
|
Merge branch 'test' into dev
|
2021-06-17 15:22:58 +08:00 |
|
|
|
b5c001eacf
|
Merge remote-tracking branch 'origin/test' into simulation-new-logic
|
2021-06-17 15:00:20 +08:00 |
|
|
|
f7c4fbebbd
|
列车运行控制——修改列车最高速度为100km/h
|
2021-06-17 15:00:09 +08:00 |
|
|
|
f7910e91cc
|
Merge remote-tracking branch 'origin/test' into test
|
2021-06-17 14:59:59 +08:00 |
|
|
|
7830e4ed63
|
修改：运行图加载计划查询bug
|
2021-06-17 14:59:22 +08:00 |
|
|
|
d71ca4f07c
|
Merge remote-tracking branch 'origin/test' into simulation-new-logic
|
2021-06-17 14:40:59 +08:00 |
|
|
|
da878922fc
|
仿真抽象——观察者和被观察者接口调整（接口添加属性和值参数）
新仿真逻辑——运行计划对象构建
列车运行控制——变为自动挡，速度控制问题和逻辑调整
|
2021-06-17 14:40:16 +08:00 |
|
|
|
ad95a35a04
|
修改：IBP盘个别元素添加影响范围
|
2021-06-17 14:27:29 +08:00 |
|
|
|
7365c9b85f
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-06-17 10:50:32 +08:00 |
|
|
|
e67d9aa597
|
修改：设置联锁自动触发的逻辑；联锁自动触发条件检查
|
2021-06-17 10:48:43 +08:00 |
|
|
|
6256f6b8b3
|
添加到那儿了小程序登录接口
调整小程序code换用户信息接口，兼容多小程序
|
2021-06-16 17:31:15 +08:00 |
|
|
|
4ef20d7d62
|
Merge remote-tracking branch 'origin/test' into rt-simulation
|
2021-06-16 16:02:26 +08:00 |
|
|
|
55e6cbd5e7
|
修改登录查询根据账号和密码查询账户逻辑：先根据邮箱或手机号查，如果不存在，根据账号查，查询出的用户数量如果等于1并且组织不存在，则找到；否则如果组织存在，根据组织筛选
|
2021-06-16 16:02:02 +08:00 |
|
|
|
c39648bd59
|
修改：换端逻辑的循环条件
|
2021-06-16 15:02:55 +08:00 |
|
|
|
02e961d5fa
|
新增：模板运行图编辑名称功能
|
2021-06-16 14:32:03 +08:00 |
|
|
|
b0bc56dd81
|
修改：IBP盘bug
|
2021-06-16 13:41:29 +08:00 |
|
|
|
344275fb68
|
修改：IBP盘实现方式
|
2021-06-16 13:04:03 +08:00 |
|
|
|
dea15cefac
|
新增：地图数据增加描述字段
|
2021-06-16 13:03:07 +08:00 |
|
|
|
fa76a0502a
|
修改：设置扣车后不触发进路问题（西安三39）
|
2021-06-16 10:10:51 +08:00 |
|
|
|
c3d4688268
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-06-11 17:47:49 +08:00 |
|
|
|
c64bedaba5
|
修改：加载备用车时的重叠检测
|
2021-06-11 17:47:29 +08:00 |
|
|
|
cd5d93bd7a
|
Merge remote-tracking branch 'origin/test' into rt-simulation
|
2021-06-11 14:53:42 +08:00 |
|
|
|
c0dbed5edc
|
添加根据用户id获取扮演的仿真成员接口
|
2021-06-11 14:53:31 +08:00 |
|
|
|
7d2738a889
|
新增：IBP盘计轴预复位
|
2021-06-11 14:49:00 +08:00 |
|
|
|
618ec74584
|
新增：加载备用车时检查列车重叠
|
2021-06-11 14:39:59 +08:00 |
|
|
|
c8c8a2132f
|
修改：加载备用车时，s/t Number的值改为空字符串（解决加载备用车有上一次的车次的问题）
|
2021-06-11 11:10:29 +08:00 |
|
|
|
92d187684c
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-06-11 09:55:40 +08:00 |
|
|
|
3b1f08df5d
|
移除：自动缓解EB逻辑
|
2021-06-11 09:55:20 +08:00 |
|
|
|
bb28a0ab7d
|
用户管理添加根据账户、父账户条件查询
|
2021-06-11 09:21:23 +08:00 |
|
|
|
680edf87e7
|
Merge remote-tracking branch 'origin/test' into third-part-control
|
2021-06-10 18:16:30 +08:00 |
|
|
|
e6c6f9335b
|
第三方登录无企业账户bug修改
|
2021-06-10 18:16:18 +08:00 |
|
|
|
1a0bc76c9d
|
修改：账户数据插入方式
|
2021-06-10 17:02:31 +08:00 |
|
|
|
96af0971ec
|
修改：判断抢路逻辑（西安三问题29）
|
2021-06-10 15:59:13 +08:00 |
|
|
|
d7b0e8c065
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-06-10 14:39:46 +08:00 |
|
|
|
2fe8097887
|
修改：发布地图一键校验功能以创建仿真的方式校验
|
2021-06-10 14:39:15 +08:00 |
|
|
|
760a2d7768
|
权限分发管理添加分发给指定用户功能
用户根据组织查询报错修复
添加用户删除功能（逻辑删除，只是在用户管理列表里不显示）
|
2021-06-10 13:27:19 +08:00 |
|
|
|
57122eed48
|
修改自定义sql中的sys_user
|
2021-06-10 11:20:52 +08:00 |
|
|
|
0c432a60ca
|
修改自定义sql中的sys_user
|
2021-06-10 11:10:31 +08:00 |
|
|
|
09de047a74
|
Merge remote-tracking branch 'origin/test' into third-part-control
|
2021-06-09 18:30:19 +08:00 |
|
|
|
afc937068a
|
添加第三方账户仿真权限逻辑判断
添加在线用户管理接口
|
2021-06-09 18:30:02 +08:00 |
|
|
|
81c691d65d
|
修改：延续保护解锁bug
|
2021-06-09 16:13:48 +08:00 |
|
|
|
d86ddf5bd4
|
修改：延续保护解锁bug
|
2021-06-09 14:50:14 +08:00 |
|
|
|
551bdaebf9
|
Merge remote-tracking branch 'origin/test' into third-part-control
|
2021-06-09 10:56:56 +08:00 |
|
|
|
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 |
|
|
|
1267565d53
|
Merge branch 'test' into dev
|
2021-06-09 10:52:43 +08:00 |
|
|
|
60d2b7118a
|
Merge remote-tracking branch 'origin/test' into map-data-handle
|
2021-06-09 10:51:13 +08:00 |
|
|
|
91be05e37a
|
修改：延续保护解锁bug
|
2021-06-09 10:50:36 +08:00 |
|
|
|
a7315c4adf
|
添加创建账户接口
添加第三方登录接口逻辑
|
2021-06-09 10:31:34 +08:00 |
|
|
|
fe66f80bc7
|
修改：确认运行至前方站/越红灯指令取消自动升级逻辑（西安三问题36）
|
2021-06-08 18:12:25 +08:00 |
|
|
|
e8c7c524f7
|
修改：确认运行至前方站/越红灯指令取消自动升级逻辑
|
2021-06-08 18:08:47 +08:00 |
|
|
|
0e9b18db75
|
修改SysUser为SysAccount，修改相关名称
账户表添加第三方相关字段
|
2021-06-08 16:08:33 +08:00 |
|
|
|
5a5f8a4508
|
新增：IBP盘扣车状态（西安三问题35）
|
2021-06-08 15:46:54 +08:00 |
|
|
|
c3c8ebaf38
|
新增：计划车车次不能重复（西安三问题28）
|
2021-06-08 15:40:57 +08:00 |
|
|
|
55365d9b12
|
修改：延续保护解锁时不检查锁闭状态（西安三问题33）
|
2021-06-08 14:16:56 +08:00 |
|
|
|
15338c67d9
|
新增：列车抵达站台时更新扣车状态
|
2021-06-08 13:21:06 +08:00 |
|
|
|
5807323b89
|
修改：非通信车占用区段移动授权计算bug
|
2021-06-07 17:43:19 +08:00 |
|
|
|
b1caa5125b
|
Merge remote-tracking branch 'origin/test' into map-data-handle
|
2021-06-07 17:01:27 +08:00 |
|
|
|
dbdf07fb28
|
地图vo对象移动到新的文件夹（未完成）
|
2021-06-07 17:01:02 +08:00 |
|
|
|
49f6b357d3
|
新增：教学管理查看使用时长
|
2021-06-07 16:11:55 +08:00 |
|
|
|
179b880409
|
修改：PSL逻辑bug
|
2021-06-07 11:06:30 +08:00 |
|
|
|
f25f8f5972
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-06-07 08:50:41 +08:00 |
|
|
|
1d103955ce
|
新增：PSL盘逻辑
|
2021-06-07 08:50:00 +08:00 |
|
|
|
6aed3492ba
|
Merge remote-tracking branch 'origin/test' into rt-train-drive
|
2021-06-04 18:07:33 +08:00 |
|
|
|
ade76fedbd
|
新接近区段数据生成逻辑
联锁触发进路逻辑开发
|
2021-06-04 18:07:14 +08:00 |
|
|
|
a93937c582
|
新增：限速指令填负数可以取消限速
|
2021-06-04 16:36:28 +08:00 |
|
|
|
ffba9f0dbf
|
Merge remote-tracking branch 'origin/test' into rt-train-drive
|
2021-06-04 09:14:57 +08:00 |
|
|
|
0b77fe4090
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-06-04 08:48:17 +08:00 |
|
|
|
4f5d79f008
|
修改：进路路径构建
|
2021-06-03 17:57:19 +08:00 |
|
|
|
90a1caa759
|
触发式消息发布对象抽象封装
虚拟真实设备状态消息发布逻辑
列车运行方向bug修改
|
2021-06-03 16:20:54 +08:00 |
|
|
|
7bba9fb3fa
|
Merge remote-tracking branch 'origin/test' into dev
|
2021-06-03 16:15:18 +08:00 |
|
|
|
af554059fa
|
修改：设置头码车的寻路逻辑
|
2021-06-03 16:01:13 +08:00 |
|
|
|
274b5f30cb
|
修改：设置头码车的寻路逻辑
|
2021-06-03 15:40:57 +08:00 |
|
|
|
b17175b2af
|
修改：设置头码车时的寻路逻辑
|
2021-06-03 14:40:45 +08:00 |
|
|
|
ce1425198c
|
修改：设置头码车时的寻路逻辑
|
2021-06-03 14:15:06 +08:00 |
|
|
|
b548a4fed1
|
修改：查询地图版本接口
|
2021-06-03 11:29:56 +08:00 |
|
|
|
c464a77768
|
修改：头码车路径构建bug
|
2021-06-03 10:31:10 +08:00 |
|
|
|
ea28f9a0d8
|
修改：非通信车占用移动授权判断逻辑 --bug292
|
2021-06-03 09:55:04 +08:00 |
|
|
|
9498b710c1
|
大铁列车驾驶控制和列车运行逻辑重构
通用获取仿真成员接口调整
仿真消息发布对象重构（分为定时消息发布和触发式消息发布，一个发布器可以支持多个订阅）
|
2021-06-02 17:56:09 +08:00 |
|
|
|
506b908a04
|
修改机器人驾驶bug
|
2021-06-02 17:54:14 +08:00 |
|
|
|
4f339de3cd
|
修改ATP自动缓解EB逻辑 --bug286
|
2021-06-02 17:15:48 +08:00 |
|
|
|
a9b21f7609
|
设置头码车逻辑修改
|
2021-06-02 16:58:23 +08:00 |
|
|
|
f291898071
|
设置头码车逻辑修改
|
2021-06-02 10:04:46 +08:00 |
|
|
|
b2967dc346
|
修改：移动授权计算；恢复ATO开启时EB自动缓解
|
2021-06-01 18:27:05 +08:00 |
|
|
|
e250aa9546
|
新增：运行图按规则加载
|
2021-06-01 16:34:07 +08:00 |
|
|
|
d8dc705efd
|
修改：信号机状态发送bug
|
2021-06-01 14:19:07 +08:00 |
|
|
|
acc47117f4
|
Merge remote-tracking branch 'origin/test' into test
|
2021-06-01 14:00:00 +08:00 |
|
|
|
d36928da2b
|
新增：信号机接近锁闭字段及状态发送；列车操纵杆字段；托管功能选择逻辑区段时，转为物理区段；几个新指令；切除ATP时取消信号EB；ATP循环逻辑检查缓解EB。
去掉：自动缓解EB逻辑
|
2021-06-01 13:59:43 +08:00 |
|
|
|
e6d0b5c35f
|
Merge remote-tracking branch 'origin/test' into test
|
2021-05-31 15:53:07 +08:00 |
|
|
|
7bd75e7c07
|
仿真消息发布对象抽象调整，仿真推送流程调整（消息订阅/发布 取消/user前缀）
添加列车车载相关逻辑
|
2021-05-31 15:52:21 +08:00 |
|
|
|
cd8efe1a21
|
修改设置头码车逻辑
|
2021-05-31 13:05:00 +08:00 |
|
|
|
ac063978f8
|
对接讯飞语音识别服务；语音训练接口使用讯飞语音识别
|
2021-05-30 21:29:59 +08:00 |
|
|
|
8bd00bdbd9
|
增加调头指令
|
2021-05-28 18:08:15 +08:00 |
|
|
|
aa40f830fc
|
修改联锁生成时code构建bug
|
2021-05-28 18:07:32 +08:00 |
|
|
|
ff7f120a43
|
Merge remote-tracking branch 'origin/test' into test
|
2021-05-28 17:50:04 +08:00 |
|
|
|
5dbba35cdf
|
修改头码车运行bug
|
2021-05-28 17:49:53 +08:00 |
|
|
|
2383d1d2bf
|
Merge remote-tracking branch 'origin/test' into test
|
2021-05-28 16:47:07 +08:00 |
|
|
|
ee60ef2d26
|
新仿真列车运行逻辑调整
添加列车驾驶控制操作
|
2021-05-28 16:46:52 +08:00 |
|
|
|
0a2ea4ad09
|
修改：头码车进路办理逻辑
|
2021-05-28 15:40:16 +08:00 |
|
|
|
7afe126f81
|
Merge remote-tracking branch 'origin/test' into test
|
2021-05-28 15:21:41 +08:00 |
|
|
|
b5aa56a127
|
延续保护接口调整
|
2021-05-28 15:21:17 +08:00 |
|
|
|
d57b75ed72
|
修改：头码车运行逻辑
|
2021-05-28 15:08:28 +08:00 |
|
|
|
bcf133e5f7
|
修改bug
|
2021-05-27 18:22:14 +08:00 |
|
|
|
b5e9cb50f2
|
Merge remote-tracking branch 'origin/test' into test
|
2021-05-27 17:31:03 +08:00 |
|
|
|
9a6f5b18ae
|
添加新的侧防数据管理接口
用户管理添加id查询条件
|
2021-05-27 17:30:40 +08:00 |
|
|
|
0414fcb0fd
|
Merge remote-tracking branch 'origin/test' into test
|
2021-05-27 17:02:54 +08:00 |
|
|
|
e26f0e11af
|
新增：RM和NRM会断开通信；进路开放信号的信号机所在站台屏蔽门故障时关闭信号。修改：非通信车接近关闭的信号机时没有物理点灯
|
2021-05-27 17:02:36 +08:00 |
|
|
|
e7db4a7382
|
修改bug
|
2021-05-27 15:30:10 +08:00 |
|
|
|
87881c2c2a
|
地图绘制进路数据更新逻辑
|
2021-05-27 15:25:09 +08:00 |
|
|
|
5e818e06ec
|
Merge remote-tracking branch 'origin/test' into test
|
2021-05-27 13:34:42 +08:00 |
|
|
|
5281528c45
|
语音识别修正
|
2021-05-27 13:34:23 +08:00 |
|
|
|
f2de22e0d8
|
延续保护中的设备状态不正确时，取消延续保护锁闭状态
|
2021-05-27 13:33:43 +08:00 |
|
|
|
bc5b9c5009
|
地图绘制进路数据、延续保护数据、信号机接近区段数据维护接口添加
|
2021-05-27 10:19:56 +08:00 |
|
|
|
d656a5071b
|
Merge remote-tracking branch 'origin/test' into test
|
2021-05-26 18:28:53 +08:00 |
|
|
|
bdb2777522
|
修改头码车不调头问题
|
2021-05-26 17:47:02 +08:00 |
|
|
|
9626833d85
|
去掉方向杆检查
|
2021-05-26 17:36:17 +08:00 |
|
|
|
76b31e9ac3
|
Merge remote-tracking branch 'origin/test' into test
|
2021-05-26 14:55:27 +08:00 |
|
|
|
3a283d1227
|
添加指令循环执行任务
|
2021-05-26 14:35:29 +08:00 |
|
|
|
c97b7caccc
|
修改仿真数据校验bug
|
2021-05-26 13:29:28 +08:00 |
|
|
|
076b1ad6f8
|
ats进路触发逻辑修改以处理小交路折返堵车问题（西安三香湖湾）；侧防满足条件修改；修改强制取消进路线路配置描述及取消进路操作逻辑；修改信号机接近区段占用、进路接近锁闭的判断逻辑。修改宁波、哈尔滨、西安三若干问题
|
2021-05-26 13:15:27 +08:00 |
|
|
|
85ccec7486
|
新仿真（大铁线路）列车驾驶功能调试
|
2021-05-25 18:05:55 +08:00 |
|
|
|
d655347512
|
Merge remote-tracking branch 'origin/test' into test
|
2021-05-24 10:43:51 +08:00 |
|
|
|
79dca6bd8d
|
站间运行等级和停站时间数据创建、修改流程
|
2021-05-24 10:43:36 +08:00 |
|
|
|
4eac911a36
|
修改仿真查询bug
|
2021-05-21 17:53:42 +08:00 |
|
|
|
910aeab327
|
虚拟信号机设置熔断故障无效
|
2021-05-21 10:47:56 +08:00 |
|
|
|
7ce6421b66
|
权限管理功能增加
|
2021-05-21 10:47:26 +08:00 |
|
|
|
8418ac8d35
|
Merge remote-tracking branch 'origin/test' into test
|
2021-05-20 17:58:32 +08:00 |
|
|
|
64d26766cf
|
文件管理添加新类型、新接口
|
2021-05-20 17:55:23 +08:00 |
|
|
|
0ba42e1021
|
西安3号线新运行图导入调整
|
2021-05-19 17:56:08 +08:00 |
|
|
|
9f2a02fe99
|
Merge remote-tracking branch 'origin/test' into test
|
2021-05-19 15:09:04 +08:00 |
|
|
|
9cb57676b0
|
列车停站时间计算修改，不再缩减停站时间
仿真数据构建添加运行等级、停站时间、站台区段可到达的临近站台区段等数据构建（未完）
配置：ATS是否自动处理人工设置的站前折返自动更新车次构建未添加bug修改
|
2021-05-19 15:07:41 +08:00 |
|
|
|
e1481d66e0
|
3维数据查询bug修改
|
2021-05-19 15:05:51 +08:00 |
|
|
|
c31d38dc66
|
大客流代码结构修改
|
2021-05-19 10:21:38 +08:00 |
|
|
|
e0e8147ff9
|
仿真管理功能兼容
|
2021-05-18 18:35:26 +08:00 |
|
|
|
a23a0594b7
|
仿真管理功能兼容
|
2021-05-18 18:32:18 +08:00 |
|
|
|
ac91ab7f46
|
控制权转换的机器人回复逻辑触发条件修改（多个行值）
|
2021-05-18 17:33:24 +08:00 |
|
|
|
11d5f6168b
|
增加<添加行值角色>功能；添加ATP进路<可以自动追踪>字段的判断、赋值
|
2021-05-18 14:02:58 +08:00 |
|
|
|
358d8ce130
|
文件管理bug修改
|
2021-05-17 19:04:33 +08:00 |
|
|
|
9b26686941
|
文件管理bug修改
|
2021-05-17 19:03:32 +08:00 |
|
|
|
570e038bc5
|
图纸绑定bug修改
|
2021-05-17 18:59:44 +08:00 |
|
|
|
cf34968f4d
|
语音文件上传方法修改
|
2021-05-17 18:29:09 +08:00 |
|
|
|
a440ba3437
|
添加图纸管理功能
|
2021-05-17 18:28:44 +08:00 |
|
|
|
62a3d2a517
|
Merge remote-tracking branch 'origin/test' into test
|
2021-05-17 18:12:07 +08:00 |
|
|
|
bfffdfdb23
|
哈尔滨紧急停车特殊车站处理（添加连锁配置）
|
2021-05-17 17:53:32 +08:00 |
|
|
|
c3bec9a093
|
实现移动列车操作逻辑
|
2021-05-14 17:56:59 +08:00 |
|
|
|
6d5d46e849
|
仿真权限添加郑州共赢都可用
|
2021-05-14 15:57:12 +08:00 |
|
|
|
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 |
|
|
|
7ec7de8aa6
|
rt仿真调整
|
2021-05-13 15:14:50 +08:00 |
|
|
|
190f510ba3
|
rt仿真调整
|
2021-05-13 15:14:18 +08:00 |
|
|
|
f189b728fd
|
旧仿真继承新仿真-添加大客流任务-添加真实设备任务；rtSimulationMember实现buildVO方法
|
2021-05-13 13:19:06 +08:00 |
|
|
|
4736b6c326
|
Merge remote-tracking branch 'origin/test' into test
|
2021-05-12 18:28:22 +08:00 |
|
|
|
ddf981be2e
|
旧仿真继承新仿真接口
|
2021-05-12 18:11:03 +08:00 |
|
Jade
|
105e824236
|
文档接口
|
2021-05-12 13:44:50 +08:00 |
|
|
|
5de44e7263
|
CBTC仿真修改路径构建bug
|
2021-05-11 16:50:05 +08:00 |
|
|
|
7fc5acb638
|
CBTC仿真修改路径构建缺虚拟信号机bug
|
2021-05-11 16:38:14 +08:00 |
|
|
|
9cb5e4e34d
|
Merge remote-tracking branch 'origin/test' into restruct-new
|
2021-05-11 16:02:03 +08:00 |
|
|
|
37aa551580
|
Merge remote-tracking branch 'origin/test' into test
|
2021-05-11 16:01:15 +08:00 |
|
|
|
1c7099ce42
|
ATP和联锁进路排列条件修改
|
2021-05-11 16:00:58 +08:00 |
|
|
|
8cdf4f7100
|
仿真结构——仿真操作分发添加操作及结果记录对象并添加仿真操作事件发布
|
2021-05-11 15:43:02 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
b61a416da1
|
Merge remote-tracking branch 'origin/test' into restruct-new
|
2021-05-10 17:18:52 +08:00 |
|
|
|
730ab7cac9
|
发布地图数据检查与否由配置决定；获取地图数据接口添加检查配置数据
|
2021-05-10 17:11:13 +08:00 |
|
|
|
fb2f66f275
|
添加校验所有地图数据接口
|
2021-05-10 15:44:34 +08:00 |
|
|
|
ef7c81fd51
|
仿真结构——抽象仿真设备对象状态变化监控（响应式/触发式）
轨道交通仿真——实现仿真道岔、信号机、计轴和联锁道岔、信号机、区段设备状态变化通知监控逻辑
|
2021-05-10 15:04:40 +08:00 |
|
|
|
a4b42d13d8
|
列车到站后先记录实际运行图信息；实迹运行图添加是否站前折返字段
|
2021-05-10 14:34:10 +08:00 |
|
|
|
f3115f7faf
|
大铁道岔单解添加联动
|
2021-05-08 16:31:53 +08:00 |
|
|
|
ed5f05a23a
|
大铁侧防锁闭添加条件<道岔未占用>
|
2021-05-08 16:26:51 +08:00 |
|
|
|
c7d5c38b73
|
大铁进路办理代码结构修改；大铁道岔转动、单/解锁联动；cilRepository.config赋值
|
2021-05-08 14:47:20 +08:00 |
|
|
|
f234e39935
|
添加联锁机重启操作（未测试）；修改大铁侧向列车排列不了bug；添加ATS故障（未测试）
|
2021-05-08 09:21:13 +08:00 |
|
|
|
79a26eb86c
|
场景录音用户查询bug修改
|
2021-05-06 17:04:15 +08:00 |
|
|
|
5284177cf2
|
场景语音识别错误信息记录修改
|
2021-05-06 16:12:54 +08:00 |
|
|
|
0763a46ced
|
大铁道岔联动转动
|
2021-05-06 15:52:38 +08:00 |
|
|
|
1660113cb3
|
<整个场景的语音校验接口>小改动
|
2021-05-06 15:02:14 +08:00 |
|
|
|
16c88d6357
|
场景语音录制相关接口实现
|
2021-05-06 13:50:17 +08:00 |
|
|
|
05b88e4a1c
|
重载语音识别方法
|
2021-05-05 21:43:42 +08:00 |
|
|
|
7b960c809e
|
大铁进路排列代码结构调整
|
2021-05-05 18:54:55 +08:00 |
|
|
|
0237c53000
|
场景语音录制
|
2021-04-30 18:29:07 +08:00 |
|
|
|
edf2973634
|
竞赛错误语音记录
|
2021-04-30 14:06:50 +08:00 |
|
|
|
732a856207
|
大铁引导办理增加检查
|
2021-04-30 13:04:01 +08:00 |
|
|
|
687ada1133
|
竞赛场景恢复
|
2021-04-29 18:59:35 +08:00 |
|
|
|
5db771b765
|
大铁排列进路区段提前锁闭问题修改
|
2021-04-29 18:47:49 +08:00 |
|
|
|
de20ed1f5b
|
大铁操作bug修改
|
2021-04-29 18:18:48 +08:00 |
|
|
|
7cd4eaac15
|
大铁进路逻辑修改；剧本车次识别增加内容
|
2021-04-29 17:31:44 +08:00 |
|
|
|
e966d6360c
|
竞赛场景暂时走小程序逻辑、操作类动作直接完成（为了测试）
|
2021-04-29 16:46:02 +08:00 |
|
|
|
38ce09edf8
|
竞赛场景暂时走小程序逻辑、非会话动作直接完成（为了测试）
|
2021-04-29 16:36:47 +08:00 |
|
|
|
b34a77df10
|
数据构建bug修改
|
2021-04-29 15:57:57 +08:00 |
|
|
|
d5b588d21a
|
Merge remote-tracking branch 'origin/test' into test
|
2021-04-29 15:47:47 +08:00 |
|
|
|
f9aa41c5bd
|
语音识别结果修正内容增加
|
2021-04-29 15:47:34 +08:00 |
|
|
|
e17503d902
|
Merge remote-tracking branch 'origin/test' into test
|
2021-04-29 15:30:11 +08:00 |
|
|
|
9089cd122e
|
轨道交通仿真——commonRepository的轨道路径构建修改
|
2021-04-29 15:29:57 +08:00 |
|
|
|
3f45fc1c8f
|
语音训练功能添加结果修正；大铁仿真bug修改；添加大铁项目登录
|
2021-04-29 13:30:45 +08:00 |
|
|
|
7abffd511e
|
Merge remote-tracking branch 'origin/test' into test
|
2021-04-29 10:47:20 +08:00 |
|
|
|
d1ff82aaf0
|
仿真结构——仿真、仿真成员、仿真用户vo信息通用获取接口及流程抽象实现
|
2021-04-29 10:47:02 +08:00 |
|
|
|
bd80a423c1
|
语音识别服务修改
|
2021-04-29 09:21:29 +08:00 |
|
|
|
604bfd0d20
|
大铁引导bug修改
|
2021-04-28 18:49:57 +08:00 |
|
|
|
5604630845
|
道岔初始化bug修改；接近锁闭判断条件修改；
|
2021-04-28 18:12:00 +08:00 |
|
|
|
ecdd948079
|
Merge remote-tracking branch 'origin/test' into test
|
2021-04-28 17:29:02 +08:00 |
|
|
|
66dcf3541c
|
大铁线路信号机接近区段数据构建
|
2021-04-28 17:28:47 +08:00 |
|
|
|
6c80e68b75
|
取消列车进入进路逻辑判断；引导信号颜色修改；进路初始化逻辑添加
|
2021-04-28 17:26:08 +08:00 |
|
|
|
88ec13709f
|
Merge remote-tracking branch 'origin/test' into test
|
2021-04-28 15:40:34 +08:00 |
|
|
|
1505ff4604
|
大铁引导总锁和通过进路操作
|
2021-04-28 15:40:20 +08:00 |
|
|
|
035f9fffdf
|
大铁线路进路数据构建bug修改，添加删除时更新敌对关系逻辑
|
2021-04-28 14:51:26 +08:00 |
|
|
|
d9226d47b6
|
轨道交通仿真——srSignal状态初始化修改
|
2021-04-28 10:44:44 +08:00 |
|
|
|
6b69b956b6
|
Merge remote-tracking branch 'origin/test' into test
|
2021-04-28 10:34:35 +08:00 |
|
|
|
f26d4516e6
|
轨道交通仿真——仿真设备添加状态初始化
|
2021-04-28 10:34:15 +08:00 |
|
|
|
6d40a8c5d9
|
Merge remote-tracking branch 'origin/test' into test
|
2021-04-28 09:29:00 +08:00 |
|
|
|
c231bc5ead
|
大铁仿真操作实现中
|
2021-04-28 09:28:49 +08:00 |
|
|
|
bd3b7b8087
|
轨道交通仿真——仿真设备添加状态初始化
|
2021-04-27 18:42:37 +08:00 |
|
|
|
63fdbbfcaf
|
轨道交通仿真——处理报错
|
2021-04-27 17:11:31 +08:00 |
|
|
|
04d42aff4f
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# src/main/java/club/joylink/rtss/simulation/rt/CIL/bo/CilSignal.java
|
2021-04-27 17:10:29 +08:00 |
|
|
|
4e553f67bd
|
轨道交通仿真——添加信号机故障注入、移除逻辑，信号机基础属性添加是否调车信号机字段
|
2021-04-27 17:09:40 +08:00 |
|
|
|
d2c9e3436a
|
Merge remote-tracking branch 'origin/test' into test
|
2021-04-27 09:19:53 +08:00 |
|
|
|
9df81aecf4
|
大铁仿真操作实现中
|
2021-04-27 09:19:39 +08:00 |
|
|
|
b894b414df
|
轨道交通仿真——添加计轴故障注入、移除逻辑完善
|
2021-04-26 18:39:24 +08:00 |
|
|
|
bad2536d3f
|
仿真结构——添加仿真时间消息同步，仿真故障注入、移除通用接口和事件机制
轨道交通仿真——添加道岔故障注入、移除逻辑
|
2021-04-26 17:09:35 +08:00 |
|
|
|
48bc9bd59d
|
删除道岔、区段、信号机的Cil类中本应属于Common类的字段
|
2021-04-26 13:54:39 +08:00 |
|
|
|
1590a7cbcc
|
大铁仿真操作实现中
|
2021-04-26 13:25:46 +08:00 |
|
|
|
71b5dcbf59
|
Merge remote-tracking branch 'origin/test' into test
|
2021-04-25 17:53:25 +08:00 |
|
|
|
b0946a9baf
|
轨道交通仿真——通用数据repo构建
|
2021-04-25 17:53:06 +08:00 |
|
|
|
0331485a8b
|
Merge remote-tracking branch 'origin/test' into test
|
2021-04-23 18:14:14 +08:00 |
|
|
|
71245dd6a2
|
新版仿真操作实现中
|
2021-04-23 18:13:47 +08:00 |
|
|
|
d6c5cfaecf
|
消息推送——ATS消息构建调整
|
2021-04-23 18:12:20 +08:00 |
|
|
|
a261c9e3e9
|
Merge remote-tracking branch 'origin/test' into test
|
2021-04-23 15:23:34 +08:00 |
|
|
|
34f3c7a94b
|
消息推送——ATS构建下一发送消息问题修改
|
2021-04-23 15:23:08 +08:00 |
|
|
|
0e3ab8cac8
|
新版仿真进路与取消进路实现；子系统更新接口修改
|
2021-04-23 15:20:39 +08:00 |
|
|
|
0f64c9b2c3
|
仿真公共接口添加初始化接口
|
2021-04-23 14:38:36 +08:00 |
|
|
|
8912639885
|
仿真设备状态消息推送流程抽象
轨道交通仿真——实现ATS消息推送流程
|
2021-04-23 14:18:53 +08:00 |
|
|
|
55300ffa1e
|
大铁通过多进路创建bug修改
|
2021-04-23 10:53:17 +08:00 |
|
|
|
a1a65a216a
|
ats道岔消息构建添加更多字段
|
2021-04-22 17:50:13 +08:00 |
|
|
|
e15ed2db11
|
新版仿真ws消息推送实现
|
2021-04-22 16:04:28 +08:00 |
|
|
|
303760220a
|
轨道交通仿真——创建过程添加初始化仿真成员和创建者扮演成员，调通操作调用
|
2021-04-22 14:40:20 +08:00 |
|
|
|
89d8c4b198
|
仿真创建时构建数据逻辑修改；地图子系统编辑添加对newApi的修改功能；添加生成单个子系统的接口（未测试）
|
2021-04-22 11:18:14 +08:00 |
|
|
|
828c618db7
|
Merge remote-tracking branch 'origin/test' into test
|
2021-04-22 11:05:53 +08:00 |
|
|
|
a3b9a6c81f
|
轨道交通仿真——添加道岔转动三个操作
|
2021-04-22 11:01:09 +08:00 |
|
|
|
c23da105a0
|
新版仿真，添加创建仿真和获取仿真信息接口（构建数据的逻辑先去掉了，因为大铁线路数据不完整）；仿真消息发送功能实现中
|
2021-04-22 10:51:38 +08:00 |
|
|
|
e7db868c99
|
轨道交通仿真仓库构建修改
|
2021-04-22 10:27:50 +08:00 |
|
|
|
7b6cb60ba3
|
地图检查配置字段导入导出添加
|
2021-04-22 09:06:08 +08:00 |
|
|
|
79cc4b43b4
|
地图绘制添加检查配置和发布时是否检查逻辑
地图数据添加相关配置字段
|
2021-04-21 16:02:10 +08:00 |
|
|
|
78459f3a1b
|
大铁进路生成逻辑bug修改
地图绘制添加检查配置
|
2021-04-21 14:56:32 +08:00 |
|
|
|
e4cbf34b01
|
大铁进路生成逻辑bug修改
|
2021-04-21 09:47:25 +08:00 |
|
|
|
d9ed6eea4e
|
Merge remote-tracking branch 'origin/test' into test
|
2021-04-19 17:24:56 +08:00 |
|
|
|
a81d9f1677
|
新仿真通用对象构建添加侧防
大铁进路生成添加敌对进路关系构建和重复code检查逻辑
|
2021-04-19 17:24:35 +08:00 |
|
|
|
57deb846f1
|
信号按钮添加字段
|
2021-04-19 16:35:50 +08:00 |
|
|
|
1d2157db49
|
Merge remote-tracking branch 'origin/test' into test
|
2021-04-19 16:02:04 +08:00 |
|
|
|
13b6581f09
|
新仿真通用对象构建添加进路、延续保护进路
|
2021-04-19 16:01:46 +08:00 |
|
|
|
d50157321a
|
信号机类型添加调车信号机
|
2021-04-19 13:49:35 +08:00 |
|
|
|
cd521791fc
|
Merge remote-tracking branch 'origin/test' into test
|
2021-04-16 18:31:06 +08:00 |
|
|
|
f9d95dba62
|
新版仿真进路办理及道岔转动逻辑初步实现
|
2021-04-16 18:30:54 +08:00 |
|
|
|
dbd2d0f22e
|
添加仿真通用对象构建
大铁进路创建接口和生成逻辑开发
地图数据检查重新实现（未完成）
|
2021-04-16 18:12:28 +08:00 |
|
DU
|
b0ecb17cf2
|
导入地图数据修改
|
2021-04-16 11:05:04 +08:00 |
|
|
|
8f0199b6a3
|
Merge remote-tracking branch 'origin/test' into test
|
2021-04-13 18:31:09 +08:00 |
|
|
|
a0d99564e4
|
地图数据添加信号按钮
|
2021-04-13 18:30:59 +08:00 |
|
DU
|
c540da932a
|
删除测试代码
|
2021-04-13 17:06:06 +08:00 |
|
DU
|
011ffd5ccf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2021-04-13 16:59:55 +08:00 |
|
DU
|
4220a2881d
|
测试语音
|
2021-04-13 16:59:46 +08:00 |
|
|
|
f90726cacf
|
扫码登录也根据登录项目设置组织信息
|
2021-04-13 16:08:44 +08:00 |
|
DU
|
ce39d404b1
|
地图分组导入bug修改
|
2021-04-13 15:37:01 +08:00 |
|
DU
|
485f37d06c
|
华为语音jar引入
|
2021-04-13 10:03:24 +08:00 |
|
DU
|
3bd9cb71a7
|
地图组管理修改
|
2021-04-13 10:00:29 +08:00 |
|
|
|
d703a3e128
|
Merge remote-tracking branch 'origin/test'
|
2021-04-12 19:07:23 +08:00 |
|
DU
|
997773136f
|
先删除华为语音相关
|
2021-04-12 19:01:57 +08:00 |
|
|
|
9656fdb80e
|
Merge remote-tracking branch 'origin/test'
|
2021-04-12 18:50:08 +08:00 |
|
|
|
87aab8ab15
|
Merge remote-tracking branch 'origin/test' into test
|
2021-04-12 18:49:42 +08:00 |
|
DU
|
cc8d28295c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2021-04-12 18:48:50 +08:00 |
|
|
|
a46c3c9805
|
目的地码构建代码调整
|
2021-04-12 18:48:49 +08:00 |
|
DU
|
250de1dc73
|
地图数据归类，huawei语音调试
|
2021-04-12 18:48:41 +08:00 |
|
|
|
7b426cbf45
|
目的地码数据构建bug修改
|
2021-04-12 17:36:38 +08:00 |
|
|
|
783db4fa0f
|
目的地码数据构建速度优化
|
2021-04-12 16:09:07 +08:00 |
|
|
|
b03c41705e
|
包调整
|
2021-04-12 11:36:36 +08:00 |
|
|
|
986fc71d60
|
包调整
|
2021-04-12 11:35:21 +08:00 |
|
|
|
7f0a9284fe
|
Merge remote-tracking branch 'origin/test' into test
|
2021-04-12 11:31:58 +08:00 |
|
|
|
6d7ff4b6fd
|
修改包名
|
2021-04-12 11:31:41 +08:00 |
|
|
|
c4de48a386
|
华为语音识别回滚
|
2021-04-12 11:21:29 +08:00 |
|
DU
|
776955fbdb
|
华为语音包依赖
|
2021-04-12 11:17:26 +08:00 |
|
DU
|
d7cadb46b7
|
语音识别修改
|
2021-04-12 11:14:38 +08:00 |
|
|
|
d681f9c29a
|
华为语音识别回滚
|
2021-04-12 11:11:29 +08:00 |
|
DU
|
83d7238b11
|
Merge remote-tracking branch 'origin/test' into test1
|
2021-04-12 11:04:31 +08:00 |
|
DU
|
80349d14c0
|
Revert "Revert "删除表sql""
语音识别改用百度接口
|
2021-04-12 11:02:42 +08:00 |
|
|
|
1582188a39
|
Merge remote-tracking branch 'origin/test' into test
|
2021-04-12 11:01:48 +08:00 |
|
|
|
de1858889a
|
交路生成过滤掉少于两个站台轨的交路的构建
|
2021-04-12 11:01:30 +08:00 |
|
|
|
08f06554bb
|
仿真权限校验逻辑修改
|
2021-04-12 10:57:07 +08:00 |
|
|
|
cc0a01aebb
|
Revert "Revert "改用华为语音识别服务""
This reverts commit bec904c7
|
2021-04-12 10:11:10 +08:00 |
|
|
|
249c8c1eb7
|
Merge remote-tracking branch 'origin/test' into test
|
2021-04-09 18:24:48 +08:00 |
|
|
|
5485c27c3b
|
泰雷兹操作调试
|
2021-04-09 18:24:39 +08:00 |
|
|
|
f8f4352008
|
新仿真逻辑开发
|
2021-04-09 18:23:34 +08:00 |
|
DU
|
b5e3e5d2e5
|
宁波三导入修改
|
2021-04-09 11:05:09 +08:00 |
|
DU
|
bf109450e5
|
运行图校验修改 宁波三导入备车变更车次回库外加一个服务车次
|
2021-04-09 10:23:00 +08:00 |
|
DU
|
6aee4ce7e9
|
运行图中间出库调整
|
2021-04-08 16:39:44 +08:00 |
|
DU
|
34b5be2c29
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-04-07 18:27:27 +08:00 |
|
DU
|
f242c3ca26
|
运行图出库首站/入库末站在环路上，校验增加出入库，编辑操作去掉出入库设置
|
2021-04-07 18:27:19 +08:00 |
|
|
|
6e06be24fe
|
Merge remote-tracking branch 'origin/test' into test
|
2021-04-07 17:59:31 +08:00 |
|
|
|
2a28c4f48e
|
转换轨列车不发车bug修改
|
2021-04-07 17:58:54 +08:00 |
|
DU
|
d0e68bf84e
|
校验修改
|
2021-04-06 19:40:38 +08:00 |
|
DU
|
c9c491848b
|
校验修改
|
2021-04-06 19:18:32 +08:00 |
|
DU
|
d81ec9f650
|
修改运行图校验
|
2021-04-06 18:46:56 +08:00 |
|
DU
|
34e1388120
|
运行图生成
|
2021-04-06 18:16:32 +08:00 |
|
DU
|
3cc7c1c548
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-04-06 18:14:32 +08:00 |
|
DU
|
1fa4451a2d
|
运行图校验
|
2021-04-06 18:14:20 +08:00 |
|
|
|
2bad6177d1
|
Merge remote-tracking branch 'origin/test' into test
|
2021-04-06 13:38:21 +08:00 |
|
|
|
59891464a1
|
更新地图版本时不再生成默认交路
|
2021-04-06 13:38:06 +08:00 |
|
|
|
9f2d67de6a
|
Merge remote-tracking branch 'origin/test' into test
|
2021-04-02 19:41:48 +08:00 |
|
|
|
6798b74964
|
侧防锁闭逻辑bug修改
新仿真逻辑——CI功能开发
|
2021-04-02 19:41:34 +08:00 |
|
|
|
8d3cfc90ba
|
移动授权计算bug修改
|
2021-04-02 18:54:47 +08:00 |
|
|
|
28f992fb7c
|
Merge remote-tracking branch 'origin/test' into test
|
2021-04-02 18:07:17 +08:00 |
|
|
|
9ef0bb210d
|
屏蔽门关门后，如果线路选择了自动调整运行，延时6秒发车
|
2021-04-02 18:07:04 +08:00 |
|
|
|
a166f3e4be
|
侧防锁闭逻辑问题修改
|
2021-04-02 17:07:03 +08:00 |
|
|
|
5965385be5
|
联锁进路信号机级别、重复封锁、开放进路后联锁条件检查等流程修改
|
2021-04-02 16:23:12 +08:00 |
|
|
|
2f0e64a231
|
Merge remote-tracking branch 'origin/test' into test
|
2021-04-02 16:19:41 +08:00 |
|
|
|
04a49c1f2d
|
补充真实设备的故障状态重置
|
2021-04-02 16:19:32 +08:00 |
|
|
|
6c247db987
|
三维课程数据接口bug修改
|
2021-04-02 15:34:56 +08:00 |
|
|
|
085383bb5f
|
三维课程数据接口bug修改
|
2021-04-02 15:32:19 +08:00 |
|
|
|
4f6e140a31
|
Merge remote-tracking branch 'origin/test' into test
|
2021-04-02 14:22:38 +08:00 |
|
|
|
277eb6e244
|
移动授权计算逻辑修改
|
2021-04-02 14:22:19 +08:00 |
|
|
|
a3465dc020
|
新仿真逻辑——CI联锁系统逻辑开发
|
2021-04-02 11:22:40 +08:00 |
|
|
|
7027712908
|
添加信号机新字段存储对象逻辑
|
2021-04-02 11:21:14 +08:00 |
|
|
|
d90288429d
|
Merge remote-tracking branch 'origin/test' into test
|
2021-04-02 11:18:03 +08:00 |
|
|
|
3fbe678a5d
|
进路侧防逻辑调整，添加侧防为信号机时，禁止信号机进路办理逻辑
|
2021-04-02 11:17:41 +08:00 |
|
|
|
47d5ad0bb0
|
修改因组织和项目改为一对多关系导致的bug
|
2021-04-02 10:51:49 +08:00 |
|
|
|
707d23e2cc
|
修改接口地址
|
2021-04-02 09:06:18 +08:00 |
|
|
|
376c4c6a54
|
Merge remote-tracking branch 'origin/test' into test
|
2021-04-02 08:53:35 +08:00 |
|
|
|
733c06b191
|
用户表添加org_id，导入的学生与组织永远关联；组织和项目改为一对多
|
2021-04-01 16:30:01 +08:00 |
|
|
|
1278ab42e1
|
Merge remote-tracking branch 'origin/test' into test
|
2021-03-31 18:07:19 +08:00 |
|
|
|
d52faf40e7
|
开发三维课程数据增删改查接口
|
2021-03-31 18:06:59 +08:00 |
|
|
|
14d168b88f
|
添加管理员查询组织树接口
|
2021-03-31 15:32:27 +08:00 |
|
|
|
0e2d9e339a
|
Merge remote-tracking branch 'origin/test' into test
|
2021-03-31 14:23:06 +08:00 |
|
|
|
9c62b15593
|
新仿真逻辑——CI联锁系统逻辑开发
|
2021-03-31 14:22:43 +08:00 |
|
|
|
d1c27dc910
|
打开的屏蔽门ma计算bug修改
|
2021-03-31 09:53:38 +08:00 |
|
|
|
ad506486c0
|
教学管理考试查询bug修改
|
2021-03-30 18:27:44 +08:00 |
|
|
|
06f9914f1a
|
修改课程查询接口
|
2021-03-30 15:24:35 +08:00 |
|
|
|
4793a5a21a
|
查询排课报错
|
2021-03-30 15:10:58 +08:00 |
|
|
|
740cded8d8
|
修改教学管理功能及bug
|
2021-03-30 14:39:03 +08:00 |
|
|
|
13afe241fa
|
课程和考试的重名检测不过滤下架的数据
|
2021-03-30 13:22:54 +08:00 |
|
|
|
fccd063da8
|
Merge remote-tracking branch 'origin/test' into test
|
2021-03-30 13:05:39 +08:00 |
|
|
|
0333bb4a2d
|
评价规则bug修改
|
2021-03-30 13:05:25 +08:00 |
|
DU
|
e757d5c50e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-03-30 09:38:39 +08:00 |
|
DU
|
40e5ea3af8
|
默认运行等级 变成70~50km/h
|
2021-03-30 09:38:31 +08:00 |
|
|
|
e7099f59af
|
Merge remote-tracking branch 'origin/test' into test
|
2021-03-29 18:30:19 +08:00 |
|
|
|
a6485ca3e8
|
新仿真对象逻辑调整
新仿真逻辑——CI联锁系统逻辑开发
|
2021-03-29 18:30:08 +08:00 |
|
|
|
2b0cb91e55
|
小bug修改
|
2021-03-29 18:25:57 +08:00 |
|
|
|
a658bd7312
|
课程名修改添加同名校验；评价规则应用到sql修改
|
2021-03-29 18:19:23 +08:00 |
|
|
|
ad71bfb0df
|
修改教学管理课程删除后创建同名课程依然报错bug；修改创建试卷报错bug
|
2021-03-29 17:14:17 +08:00 |
|
|
|
038f3b3ecd
|
拷贝地图功能中，拷贝考试逻辑修改
|
2021-03-29 16:25:56 +08:00 |
|
|
|
d3c9626947
|
修改<将评价规则应用到><查询评价规则能应用到>接口bug
|
2021-03-29 15:53:55 +08:00 |
|
|
|
0ac681ed53
|
考试不和课程关联
|
2021-03-29 15:04:13 +08:00 |
|
|
|
1fa81de61f
|
Merge remote-tracking branch 'origin/test' into test
|
2021-03-26 18:43:04 +08:00 |
|
|
|
de57624817
|
考试改为不和课程关联
|
2021-03-26 18:42:52 +08:00 |
|
DU
|
1a4351a084
|
回库修改
|
2021-03-26 17:20:53 +08:00 |
|
|
|
d6fe4e75fb
|
Merge remote-tracking branch 'origin/temp' into test
|
2021-03-26 17:13:40 +08:00 |
|
|
|
40956d2c52
|
Merge remote-tracking branch 'origin/test' into test
|
2021-03-26 17:08:39 +08:00 |
|
|
|
5167575dde
|
暂时提交
|
2021-03-26 17:08:06 +08:00 |
|
DU
|
9752b2b21f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-03-26 16:44:29 +08:00 |
|
DU
|
d1b8fcea3d
|
删除文件
|
2021-03-26 16:44:21 +08:00 |
|
DU
|
72a6546297
|
生成bug修改
|
2021-03-26 16:43:18 +08:00 |
|
|
|
4801d11b3b
|
教学管理bug修改
|
2021-03-25 20:42:19 +08:00 |
|
|
|
4e478b95a2
|
教学管理功能修改
|
2021-03-25 19:46:34 +08:00 |
|
|
|
7fba696238
|
Merge remote-tracking branch 'origin/test' into test
|
2021-03-25 19:06:29 +08:00 |
|
|
|
8383ec0336
|
教学管理功能修改
|
2021-03-25 19:06:08 +08:00 |
|
|
|
98fed5f681
|
新仿真运行流程调整
新仿真逻辑——计算机联锁模块数据构建.
|
2021-03-25 18:23:24 +08:00 |
|
DU
|
7a0fe8f683
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-03-25 18:18:46 +08:00 |
|
DU
|
f53cfefb8c
|
运行图接口问题修改
|
2021-03-25 18:18:38 +08:00 |
|
|
|
354f676238
|
sql修改
|
2021-03-25 15:40:36 +08:00 |
|
|
|
7e425787d9
|
Merge remote-tracking branch 'origin/test' into test
|
2021-03-25 15:03:53 +08:00 |
|
|
|
38da216a31
|
修改教学管理功能
|
2021-03-25 15:03:43 +08:00 |
|
DU
|
0c3a311323
|
运行图生成时间问题修改
|
2021-03-24 15:07:41 +08:00 |
|
DU
|
7fbc880d5d
|
运行图编辑问题修改
|
2021-03-24 13:34:20 +08:00 |
|
DU
|
9e20930f4c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-03-24 09:43:58 +08:00 |
|
DU
|
87f3296a90
|
运行图生成发车时间调整
|
2021-03-24 09:43:49 +08:00 |
|
|
|
ca2ea3a606
|
Merge remote-tracking branch 'origin/test' into test
|
2021-03-23 18:27:45 +08:00 |
|
|
|
1e82fe9b97
|
联锁生成——延续保护添加信号机字段保存
|
2021-03-23 18:27:31 +08:00 |
|
|
|
2eb8cae79a
|
运行线添加必经进路（逻辑未实现，只是添加数据）
|
2021-03-23 16:53:43 +08:00 |
|
|
|
e5282d6c0d
|
修改教学管理-评价规则功能；组织删除改为逻辑删除（未完善）
|
2021-03-23 16:47:56 +08:00 |
|
|
|
bd5d1e9d4b
|
目的地码生成逻辑报错消除
|
2021-03-23 13:24:45 +08:00 |
|
|
|
bda5126e4b
|
Merge remote-tracking branch 'origin/test' into test
|
2021-03-23 11:19:27 +08:00 |
|
|
|
d930f18d52
|
车站预复位逻辑修改
|
2021-03-23 11:18:44 +08:00 |
|
|
|
064e46b47a
|
Merge remote-tracking branch 'origin/test' into test
|
2021-03-23 09:22:41 +08:00 |
|
|
|
f0b8f3f754
|
地图绘制数据处理——逻辑区段是否站台轨处理
|
2021-03-23 09:22:24 +08:00 |
|
|
|
ced64ef381
|
Merge remote-tracking branch 'origin/test' into test
|
2021-03-23 09:02:19 +08:00 |
|
|
|
7681690896
|
数据校验添加区段是否站台轨、转换轨校验逻辑
|
2021-03-22 16:47:42 +08:00 |
|
|
|
270ef43603
|
添加按集中站获取区段的接口
|
2021-03-22 14:52:11 +08:00 |
|
|
|
3ce3360226
|
联锁生成——重构交路生成逻辑bug修改
|
2021-03-22 14:20:48 +08:00 |
|
|
|
b26ef44213
|
Merge remote-tracking branch 'origin/test' into test
|
2021-03-22 11:23:58 +08:00 |
|
|
|
ca9bb496c6
|
联锁生成——重构交路生成逻辑（现只生成一个方向交路，不再生成折返可能反向的交路）,删除生成交路车站列表字段
|
2021-03-22 11:23:37 +08:00 |
|
DU
|
914141c280
|
与系统默认交路相同的也可自定义创建
|
2021-03-22 11:19:51 +08:00 |
|
|
|
3d97dfc4af
|
Merge remote-tracking branch 'origin/test' into test
|
2021-03-19 18:27:10 +08:00 |
|
|
|
0553287cdb
|
客流策略计算bug修改
|
2021-03-19 18:26:55 +08:00 |
|
|
|
c406d1fb36
|
考试评分bug修改
|
2021-03-19 18:21:25 +08:00 |
|
|
|
8192e0be98
|
评价规则权重使用方式修改
|
2021-03-19 17:46:45 +08:00 |
|
|
|
63d7af8064
|
小bug修改
|
2021-03-19 16:14:30 +08:00 |
|
|
|
279ae5194b
|
Merge remote-tracking branch 'origin/test' into test
|
2021-03-19 15:57:06 +08:00 |
|
|
|
cce2b9aef6
|
教学管理功能修改
|
2021-03-19 15:56:52 +08:00 |
|
DU
|
f56f08f0a3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-03-19 11:38:40 +08:00 |
|
DU
|
6ef313cfa9
|
运行图生成修改
|
2021-03-19 11:38:31 +08:00 |
|
|
|
db9ee015bd
|
Merge remote-tracking branch 'origin/test' into test
|
2021-03-18 18:58:49 +08:00 |
|
|
|
0f81295f3f
|
添加检查站台状态以取消列车扣车状态的循环逻辑
|
2021-03-18 18:58:31 +08:00 |
|
DU
|
1b72bc695e
|
修改运行图生成问题
|
2021-03-18 18:49:29 +08:00 |
|
DU
|
5a1f1bdb72
|
运行图生成自动铺画出入库
|
2021-03-18 14:31:04 +08:00 |
|
DU
|
8adda9b160
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-03-17 17:08:13 +08:00 |
|
DU
|
310d5c7f7b
|
生成系统交路问题修改
|
2021-03-17 17:07:56 +08:00 |
|
|
|
3f86f1fc6c
|
联锁生成——修改交路生成逻辑问题，兼容站台轨无出站信号机情况
|
2021-03-17 16:02:05 +08:00 |
|
|
|
c521b9dcd6
|
Merge remote-tracking branch 'origin/test' into test
|
2021-03-16 13:30:44 +08:00 |
|
|
|
413a9c1c37
|
修改ATS进路触发接近区段检查逻辑问题，改为使用列车所在物理区段检查
|
2021-03-16 13:30:25 +08:00 |
|
DU
|
6cdc61151e
|
转换轨相邻车站交路生成修改
|
2021-03-15 17:03:40 +08:00 |
|
|
|
e7ab43038a
|
项目域名接口开发
|
2021-03-15 16:53:39 +08:00 |
|
|
|
5782b50944
|
Merge remote-tracking branch 'origin/test' into test
|
2021-03-15 16:24:56 +08:00 |
|
DU
|
d3f45b1b5e
|
生成时发车问题修改
|
2021-03-15 14:06:49 +08:00 |
|
DU
|
94b679893f
|
运行图问题修改
|
2021-03-15 13:07:32 +08:00 |
|
DU
|
a2a8f1f296
|
运行图问题修改
|
2021-03-15 13:05:04 +08:00 |
|
DU
|
5a8c4950c8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-03-15 11:04:06 +08:00 |
|
DU
|
c8f52f5141
|
运行图交路相关修改
|
2021-03-15 11:03:57 +08:00 |
|
|
|
b3c5c4c4f8
|
白名单修改
|
2021-03-15 10:39:10 +08:00 |
|
|
|
1f94e0ff6d
|
Merge remote-tracking branch 'origin/test' into test
|
2021-03-12 18:54:30 +08:00 |
|
|
|
7c72507527
|
新仿真逻辑——计算机联锁模块开发
仿真发布消息逻辑调整
|
2021-03-12 18:54:14 +08:00 |
|
|
|
228ae47d1c
|
Merge remote-tracking branch 'origin/test' into test
|
2021-03-12 18:45:14 +08:00 |
|
|
|
30a1685935
|
南铁院岔心设置计轴故障/预复位
|
2021-03-12 17:44:50 +08:00 |
|
DU
|
4a7817cccb
|
修改
|
2021-03-12 16:55:03 +08:00 |
|
DU
|
16509551ee
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-03-12 16:50:19 +08:00 |
|
DU
|
4c27f18a69
|
交路名称修改
|
2021-03-12 16:49:58 +08:00 |
|
|
|
f9f7564a0f
|
Merge remote-tracking branch 'origin/test' into test
|
2021-03-12 16:43:43 +08:00 |
|
DU
|
c6b8227823
|
运行图编制交路设置修改
|
2021-03-12 15:07:50 +08:00 |
|
DU
|
6505702a13
|
运行图编制修改
|
2021-03-12 11:38:03 +08:00 |
|
|
|
0b2dce823e
|
cgy添加使用记录
|
2021-03-12 11:03:10 +08:00 |
|
DU
|
5a6f87f401
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-03-12 09:10:39 +08:00 |
|
DU
|
775437150b
|
恢复交路自动生成默认交路，运行图编制可使用生成的交路。
|
2021-03-12 09:10:33 +08:00 |
|
|
|
8da937e941
|
新仿真逻辑——虚拟真实设备逻辑开发
|
2021-03-11 13:26:48 +08:00 |
|
|
|
7e96b047c2
|
ISCS查询接口添加校验
|
2021-03-11 10:44:46 +08:00 |
|
|
|
9681255916
|
将进路路径构建时的迭代次数改为由调用者传入
|
2021-03-11 10:26:55 +08:00 |
|
|
|
37c306ac27
|
Merge remote-tracking branch 'origin/test' into test
|
2021-03-10 19:58:29 +08:00 |
|
|
|
a5cbd9b07c
|
运行线添加筛选进路列表逻辑
|
2021-03-10 19:42:20 +08:00 |
|
|
|
2faf256501
|
泰雷兹排列进路到操作修改
|
2021-03-10 19:40:35 +08:00 |
|
DU
|
0a126f41a6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-03-10 17:58:39 +08:00 |
|
DU
|
1434f23db7
|
生成运行图问题修改
|
2021-03-10 17:58:30 +08:00 |
|
|
|
c0f1035f0e
|
Merge remote-tracking branch 'origin/test' into test
|
2021-03-10 16:58:49 +08:00 |
|
|
|
7fdb0dd16b
|
按计划行车，转换轨列车加载问题修改
|
2021-03-10 16:58:27 +08:00 |
|
|
|
8ef6553a20
|
Merge remote-tracking branch 'origin/test' into test
|
2021-03-09 18:05:58 +08:00 |
|
|
|
34c1b72d2e
|
道岔转动恢复失表故障的概率改为1/3
|
2021-03-09 18:05:39 +08:00 |
|
DU
|
f2baa1b51f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-03-09 17:58:07 +08:00 |
|
DU
|
39441c9a37
|
折返时间根据交路加默认值
|
2021-03-09 17:57:56 +08:00 |
|
|
|
cf6cc759e9
|
Merge remote-tracking branch 'origin/test' into test
|
2021-03-09 17:25:16 +08:00 |
|
|
|
104f50793d
|
南铁院问题修改
|
2021-03-09 17:24:49 +08:00 |
|
DU
|
1a4092577e
|
运行图修改
|
2021-03-09 15:01:33 +08:00 |
|
DU
|
c099a49ac3
|
信号机所属车站数据构建
|
2021-03-09 10:04:53 +08:00 |
|
|
|
415e92b4da
|
新仿真结构下的虚拟真实设备逻辑完善
|
2021-03-09 09:30:08 +08:00 |
|
|
|
512d49e763
|
Merge remote-tracking branch 'origin/test' into test
|
2021-03-08 14:48:15 +08:00 |
|
|
|
38e5af449b
|
添加<生成目的地码>连锁配置及生成逻辑
|
2021-03-08 14:45:35 +08:00 |
|
DU
|
e6a6184ed0
|
运行图修改
|
2021-03-08 11:46:30 +08:00 |
|
DU
|
bfd278017a
|
运行图交路定义修改，增加车站折返时间配置
|
2021-03-08 11:39:55 +08:00 |
|
|
|
15ec7c7b3b
|
Merge remote-tracking branch 'origin/test' into test
|
2021-03-05 17:48:54 +08:00 |
|
|
|
8edf518f95
|
客流车站参数管理接口开发
|
2021-03-05 17:46:56 +08:00 |
|
|
|
6ee4d141c9
|
Merge remote-tracking branch 'origin/test' into test
|
2021-03-05 16:35:31 +08:00 |
|
|
|
6abd8254b6
|
仿真结构抽象(仿真主线程逻辑调整)
虚拟真实设备逻辑开发
|
2021-03-05 16:34:54 +08:00 |
|
|
|
5fa74769c8
|
由于会导致备用车和北京一自动信号机前的列车不能运行，去掉对<未进路锁闭的区段>的检查
|
2021-03-05 14:58:54 +08:00 |
|
|
|
97a3baedb7
|
运行线逻辑完善
|
2021-03-05 13:54:55 +08:00 |
|
|
|
e091dac76a
|
修改cgy留言板数据时间修改接口
|
2021-03-04 21:27:41 +08:00 |
|
|
|
8c9093c530
|
修改cgy留言板数据时间修改接口
|
2021-03-04 21:22:14 +08:00 |
|
|
|
16bd531cd9
|
添加cgy留言板数据时间修改接口
|
2021-03-04 21:07:28 +08:00 |
|
|
|
6b0db15a6d
|
针对成工院修改留言板
|
2021-03-03 21:30:38 +08:00 |
|
|
|
fb7f3fa70c
|
仿真结构抽象(仿真数据仓库抽象，一些逻辑调整)
|
2021-03-03 19:22:31 +08:00 |
|
|
|
e8bb268287
|
Merge remote-tracking branch 'origin/test' into test
|
2021-03-03 16:56:50 +08:00 |
|
|
|
8876292193
|
仿真结构抽象(操作分发调整，用户订阅/取消订阅逻辑框架构建，添加固定频率任务接口)
|
2021-03-03 16:56:32 +08:00 |
|
|
|
a397a1c195
|
修改浙大网新停车/发车操作指令
|
2021-03-02 17:29:46 +08:00 |
|
|
|
b02db4209e
|
添加浙大网新停车/发车操作指令
|
2021-03-02 16:02:00 +08:00 |
|
|
|
dd1e5b7705
|
Merge remote-tracking branch 'origin/test' into test
|
2021-03-02 13:31:27 +08:00 |
|
|
|
1a5bb58354
|
修改目的地码数据以兼容宁波三运行线逻辑；修改头码车目标到站逻辑；修改列车扣车操作逻辑以兼容浙大网新列车扣车逻辑
|
2021-03-02 13:30:46 +08:00 |
|
DU
|
09298761bf
|
实训修改，教学成绩导出学号修改
|
2021-03-01 19:09:24 +08:00 |
|
DU
|
e3a44e76f4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-03-01 17:36:14 +08:00 |
|
DU
|
4b4b30ad9b
|
下架默认课程不显示
|
2021-03-01 17:36:05 +08:00 |
|
|
|
ada9bc6fd8
|
添加日志
|
2021-03-01 16:41:11 +08:00 |
|
|
|
fe2892dad0
|
Merge remote-tracking branch 'origin/test' into test
|
2021-02-26 18:45:17 +08:00 |
|
|
|
3265507232
|
仿真结构抽象(操作分发部分实现)
|
2021-02-26 18:44:55 +08:00 |
|
DU
|
0961ec7453
|
组织查询bug
|
2021-02-26 18:37:22 +08:00 |
|
DU
|
411cf5008d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-02-26 18:07:43 +08:00 |
|
DU
|
3c3a13030f
|
学院账号绑定顶级组织code，账号登陆验证组织绑定项目
|
2021-02-26 18:07:33 +08:00 |
|
|
|
98a6a509d4
|
CGY取消权限校验
|
2021-02-26 14:27:38 +08:00 |
|
DU
|
745a4c2999
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-02-26 10:49:47 +08:00 |
|
DU
|
825a870d8e
|
课程表加默认字段
|
2021-02-26 10:49:37 +08:00 |
|
|
|
88720cd004
|
Merge remote-tracking branch 'origin/test' into test
|
2021-02-26 10:15:24 +08:00 |
|
DU
|
68e9264d60
|
学院名称不显示bug
|
2021-02-25 16:33:02 +08:00 |
|
DU
|
05306ac91c
|
导入学员信息bug
|
2021-02-25 16:24:02 +08:00 |
|
|
|
56f6c82f02
|
Merge remote-tracking branch 'origin/test' into test
|
2021-02-25 15:20:56 +08:00 |
|
|
|
029764eb07
|
Merge remote-tracking branch 'origin/test' into test
|
2021-02-24 18:45:45 +08:00 |
|
|
|
afdbde3753
|
添加validation依赖，修复@Validated实训问题
添加注册接口（邮箱）
仿真结构抽象
|
2021-02-24 18:45:33 +08:00 |
|
DU
|
e6390321ae
|
控制权限转移修改
|
2021-02-24 18:43:44 +08:00 |
|
|
|
f289618709
|
添加<区段开放/关闭>操作
|
2021-02-24 15:40:47 +08:00 |
|
|
|
aa7e69f7dd
|
设置自动通过进路根据配置设置背景
|
2021-02-24 10:03:30 +08:00 |
|
|
|
cf2e10b9db
|
恢复车站的计轴预复位取消操作
|
2021-02-23 19:43:04 +08:00 |
|
|
|
0db6131fc8
|
添加计轴复位操作并将宁波一的IBP盘复位按钮改为调用此操作
|
2021-02-23 17:10:55 +08:00 |
|
|
|
3d8564ae84
|
Merge remote-tracking branch 'origin/test' into test
|
2021-02-23 15:59:37 +08:00 |
|
|
|
a733559ea0
|
强制点灯bug修改
|
2021-02-23 15:59:20 +08:00 |
|
DU
|
8d424521af
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-02-23 14:11:09 +08:00 |
|
|
|
653a37b1a9
|
IBP盘预复位逻辑完善；添加配置；宁波三部分操作添加
|
2021-02-23 14:03:36 +08:00 |
|
DU
|
abc0b200e4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
Conflicts:
src/main/java/club/joylink/rtss/simulation/cbtc/data/status/StationStatus.java
|
2021-02-23 13:30:48 +08:00 |
|
DU
|
1544add3a7
|
实训修改 泰雷兹跳停操作
|
2021-02-23 13:30:20 +08:00 |
|
|
|
70e60808ac
|
仿真背景保存添加车站的新字段；IBP盘加新按钮类型；IBP盘按按钮接口修改；添加接口查询车站下的区段和地图下的区段
|
2021-02-23 09:50:42 +08:00 |
|
|
|
74c5ba1a2e
|
车站状态发送修改
|
2021-02-22 16:48:24 +08:00 |
|
|
|
d89363e880
|
泰雷兹道岔封锁操作逻辑实现
|
2021-02-22 13:46:49 +08:00 |
|
|
|
71ac99cb50
|
车站预复位字段修改
|
2021-02-22 10:55:55 +08:00 |
|
|
|
b895017e9c
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# src/main/java/club/joylink/rtss/simulation/cbtc/ATS/operation/Operation.java
# src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/AtsStationService.java
|
2021-02-22 10:02:02 +08:00 |
|
DU
|
c3fd300248
|
自动折返现地实训背景bug，站台状态重置修改
|
2021-02-20 16:44:07 +08:00 |
|
DU
|
f3b9ebf4a7
|
车站控制权
|
2021-02-20 15:35:58 +08:00 |
|
|
|
8d218f15bd
|
添加车站预复位操作
|
2021-02-20 14:48:52 +08:00 |
|
DU
|
ede2afc019
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-02-20 13:40:52 +08:00 |
|
DU
|
b121560787
|
系统扣车，车站授权
|
2021-02-20 13:40:42 +08:00 |
|
|
|
572f4f1b6d
|
添加请求区域控制权(区域选择)相关属性、操作、逻辑；添加泰雷兹<道岔/命令>操作及相关属性、逻辑（未完）
|
2021-02-20 13:34:25 +08:00 |
|
|
|
0a84cbb690
|
对未锁闭的区段执行区故解去掉报错
|
2021-02-19 14:01:48 +08:00 |
|
|
|
71ddb49505
|
列车模型数据修改；添加<办理引导前是否需要信号机接近锁闭>配置项；人解引导进路时走取消引导逻辑
|
2021-02-19 13:16:28 +08:00 |
|
|
|
8ce8504521
|
订单创建类添加以分为单位的价格；列车添加运行类型；修改<全站取消自动通过进路功能无效>bug；倒车限速改为5km/h
|
2021-02-19 09:44:18 +08:00 |
|
|
|
e2bd029771
|
仿真结构抽象
|
2021-02-18 18:26:55 +08:00 |
|
|
|
bec904c711
|
Revert "改用华为语音识别服务"
This reverts commit c977e4c9
|
2021-02-18 11:33:04 +08:00 |
|
|
|
321605663f
|
Merge branch 'nb1' into test
# Conflicts:
# src/main/java/club/joylink/rtss/simulation/cbtc/data/map/MapConfig.java
|
2021-02-18 11:31:04 +08:00 |
|
|
|
a3b89f9125
|
设置/取消强制点灯操作合并
|
2021-02-18 11:29:57 +08:00 |
|
|
|
d96e44f896
|
仿真子系统添加<运行图编制工作站>；<新建单位rootId字段没有值>bug修改
|
2021-02-18 11:10:14 +08:00 |
|
|
|
983cff6af8
|
Merge branch 'restruct' into test
# Conflicts:
# src/main/java/club/joylink/rtss/services/ISysUserService.java
# src/main/java/club/joylink/rtss/services/SysUserService.java
|
2021-02-18 10:33:27 +08:00 |
|
|
|
e37ee81e86
|
微信支付回调接口修改
|
2021-02-18 09:08:38 +08:00 |
|
|
|
8e3a551ab4
|
一个小失误
|
2021-02-05 18:09:00 +08:00 |
|
|
|
c977e4c90d
|
改用华为语音识别服务
|
2021-02-05 18:06:11 +08:00 |
|
|
|
7c259ce136
|
针对宁波一问题的修改
|
2021-02-05 18:04:40 +08:00 |
|
|
|
6435f5f844
|
客流策略计算频率注释恢复
|
2021-02-05 17:42:06 +08:00 |
|
|
|
e65005a61a
|
客流策略指标定义修改，新指标计算逻辑实现
|
2021-02-05 17:41:33 +08:00 |
|
|
|
5081c580ec
|
Merge remote-tracking branch 'origin/test' into test
|
2021-02-05 16:42:07 +08:00 |
|
|
|
f3411c77c4
|
修改ATS进路触发办理折返处判断逻辑bug
|
2021-02-05 16:41:52 +08:00 |
|
DU
|
68041fa54b
|
实训修改
|
2021-02-05 15:14:56 +08:00 |
|
|
|
eb6d51c22b
|
Merge remote-tracking branch 'origin/test' into test
|
2021-02-05 13:37:28 +08:00 |
|
|
|
e37fa24c31
|
修改<未锁闭的区段>移动授权终点判定条件
|
2021-02-05 13:37:18 +08:00 |
|
|
|
55449d3a67
|
修改站间运行时间计算预计离开时间有时空指针的bug
|
2021-02-05 09:51:48 +08:00 |
|
|
|
d9f9ce640e
|
Merge remote-tracking branch 'origin/test' into test
|
2021-02-05 09:50:25 +08:00 |
|
|
|
a87ca75d37
|
修改站间运行时间计算预计离开时间有时空指针的bug
|
2021-02-05 09:50:13 +08:00 |
|
DU
|
38fd5a14a2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-02-04 18:33:55 +08:00 |
|
DU
|
6f17bc3089
|
drawWay字段删除，数据库同步删除
|
2021-02-04 18:33:46 +08:00 |
|
|
|
33ade9bc31
|
修改<未锁闭的区段>移动授权终点判定条件
|
2021-02-04 18:25:22 +08:00 |
|
|
|
5f8c2039c5
|
Merge remote-tracking branch 'origin/test' into test
|
2021-02-04 18:14:22 +08:00 |
|
|
|
51e88d488d
|
修改<未锁闭的区段>移动授权终点判定条件
|
2021-02-04 18:14:08 +08:00 |
|
|
|
3f35c48cb3
|
Merge remote-tracking branch 'origin/test' into test
|
2021-02-04 18:02:28 +08:00 |
|
|
|
5695af9fac
|
客流消息添加单独订阅路径
客流订阅事件处理
客流计算逻辑调整-跳停考虑跳站规则
策略消息推送对象修改
|
2021-02-04 18:02:11 +08:00 |
|
|
|
64e71ed9ea
|
线段加俩参数
|
2021-02-04 17:55:50 +08:00 |
|
|
|
0e8e394d04
|
Merge remote-tracking branch 'origin/test' into test
|
2021-02-04 17:39:59 +08:00 |
|
|
|
e0b6209e91
|
封锁信号机时去掉重复封锁逻辑
|
2021-02-04 17:39:51 +08:00 |
|
DU
|
74dd554a9e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-02-04 17:27:05 +08:00 |
|
DU
|
1635c356ed
|
实训补充修改
|
2021-02-04 17:26:53 +08:00 |
|
|
|
06e3ab8b6e
|
移动授权终点添加<未锁闭或延时解锁的区段>；延时解锁进路的始端信号机重开时取消延时解锁；取消进路后，始端信号机锁闭进路字段置为null
|
2021-02-04 17:18:15 +08:00 |
|
|
|
40791540e2
|
添加<ATS自动调整运行>配置
|
2021-02-04 11:10:56 +08:00 |
|
|
|
cc9aba942c
|
Merge remote-tracking branch 'origin/test' into test
|
2021-02-03 18:35:32 +08:00 |
|
|
|
ee2922f84a
|
泰雷兹操作（未测试）；边缘车站可以跳停；进路延时解锁时无法取消进路；根据运行时间计算ATO速度逻辑修改
|
2021-02-03 18:34:40 +08:00 |
|
|
|
54c5ec595c
|
空指针异常屏蔽
|
2021-02-03 18:24:30 +08:00 |
|
|
|
f843b9ace0
|
修改停站时间计算和站间运行时间计算逻辑
修改ATS进路排列触发——折返计划与出库计划冲突bug
|
2021-02-03 16:28:53 +08:00 |
|
|
|
e9d03da5e0
|
Merge remote-tracking branch 'origin/test' into test
|
2021-02-03 14:49:42 +08:00 |
|
|
|
546f558397
|
添加仿真延时任务对象和逻辑
|
2021-02-03 14:48:48 +08:00 |
|
DU
|
4aed94d481
|
实训计轴预复位修改
|
2021-02-03 11:33:13 +08:00 |
|
|
|
cb695a9be5
|
Merge remote-tracking branch 'origin/test' into test
|
2021-02-03 10:48:53 +08:00 |
|
|
|
c7460ae397
|
添加跳停+停站时间策略对象
|
2021-02-03 10:48:33 +08:00 |
|
DU
|
418c9dff1f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-02-03 10:12:42 +08:00 |
|
DU
|
fcce73733a
|
连锁控实训
|
2021-02-03 10:12:32 +08:00 |
|
|
|
616ce791fd
|
Merge remote-tracking branch 'origin/test' into test
|
2021-02-03 09:41:37 +08:00 |
|
|
|
35426622ff
|
客流策略消息推送添加到topic
|
2021-02-03 09:41:20 +08:00 |
|
DU
|
acec4fcddc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-02-02 18:40:46 +08:00 |
|
DU
|
d2e3a42304
|
实训修改
|
2021-02-02 18:40:37 +08:00 |
|
|
|
b5c3d1867e
|
Merge remote-tracking branch 'origin/test' into test
|
2021-02-02 18:35:59 +08:00 |
|
|
|
99ddf2db15
|
客流策略——跳停策略逻辑开发
|
2021-02-02 18:35:41 +08:00 |
|
DU
|
f504f457ed
|
操作参数化
|
2021-02-02 11:31:58 +08:00 |
|
DU
|
12b6bca36a
|
车站实训修改
|
2021-02-02 10:29:53 +08:00 |
|
DU
|
cfac9c6d9f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-02-02 09:28:28 +08:00 |
|
DU
|
a39bc85eaf
|
实训修改
|
2021-02-02 09:28:16 +08:00 |
|
|
|
44965d8054
|
修改进路办理超时失败时间为20秒
|
2021-02-01 13:57:32 +08:00 |
|
|
|
202e0bb01f
|
进路逻辑bug修改
|
2021-02-01 13:53:35 +08:00 |
|
|
|
dd434fe399
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-29 18:07:14 +08:00 |
|
|
|
7419a859cf
|
修改国赛权限价格
|
2021-01-29 18:06:24 +08:00 |
|
|
|
e9976772de
|
客流策略调整
|
2021-01-29 18:04:30 +08:00 |
|
|
|
d3d8bd7f0d
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-29 17:49:16 +08:00 |
|
|
|
cf5e1238d7
|
添加国赛购买流程
|
2021-01-29 17:49:11 +08:00 |
|
|
|
637908fd94
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-29 16:44:51 +08:00 |
|
|
|
298fb9a1a3
|
转换轨列车添加停站流程
修改由转换轨列车流程导致的ATS进路触发逻辑问题
修改进路延续保护道岔锁闭逻辑bug
修改转换轨列车初始化加载逻辑
|
2021-01-29 16:44:35 +08:00 |
|
DU
|
3c69dcaf30
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-01-29 14:21:31 +08:00 |
|
DU
|
2d811766ff
|
实训修改
|
2021-01-29 14:21:22 +08:00 |
|
|
|
dd4a72b130
|
联锁生成添加信号机接近区段不跨过前方同向信号机配置和逻辑
|
2021-01-29 11:23:07 +08:00 |
|
|
|
a268d69305
|
修改区段非通信车占用判断逻辑
|
2021-01-29 10:20:37 +08:00 |
|
|
|
fb343bba80
|
修改侧防锁闭条件
|
2021-01-29 09:53:04 +08:00 |
|
|
|
1f3d9a6f3a
|
按计划行车列车加载位置bug修改
|
2021-01-29 09:19:21 +08:00 |
|
|
|
917705eea8
|
ZC非通信车占用移动授权逻辑bug修改
|
2021-01-28 19:08:40 +08:00 |
|
DU
|
a89d0735f7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-01-28 18:16:19 +08:00 |
|
DU
|
a6cae4e14c
|
实训修改
|
2021-01-28 18:16:11 +08:00 |
|
|
|
aca0b3ebc6
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-28 18:10:16 +08:00 |
|
|
|
bffa883703
|
加载列车——构建列车监控信息，站间情况判断调整为列车位置是否在进路路径中
|
2021-01-28 18:09:50 +08:00 |
|
DU
|
32972e5697
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-01-28 17:57:48 +08:00 |
|
DU
|
2fdda0a4d1
|
自动进路和折返 按钮实训生成
|
2021-01-28 17:57:38 +08:00 |
|
|
|
3316c11fed
|
调整ZC非通信车占用逻辑忽略道岔区段
|
2021-01-28 17:47:08 +08:00 |
|
|
|
d669bb2d4c
|
进路路径查询方法哈尔滨ATP进路逻辑调整
|
2021-01-28 17:43:52 +08:00 |
|
|
|
05ab248b18
|
进路路径对象调整
进路路径查询方法重写
按计划行车加载列车逻辑调整
进路延续保护侧防逻辑问题修改
|
2021-01-28 16:36:07 +08:00 |
|
|
|
6531a09c60
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-28 09:10:01 +08:00 |
|
|
|
a1e2e9dc8c
|
客流策略计算结构调整
|
2021-01-28 09:09:46 +08:00 |
|
|
|
447b0e861a
|
运行图发布后删除旧的派班计划
|
2021-01-27 19:18:18 +08:00 |
|
|
|
ec71cf4c20
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-27 19:05:33 +08:00 |
|
|
|
467cae3d01
|
运行图发布后删除缓存
|
2021-01-27 19:05:20 +08:00 |
|
DU
|
62edf56871
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-01-27 18:17:43 +08:00 |
|
DU
|
e1ef8cf549
|
运行图编制修改，加载列车位置修改，ato bug修改
|
2021-01-27 18:17:34 +08:00 |
|
|
|
f6814f8e04
|
客流模拟仿真逻辑调整
修改停站时间策略逻辑bug
添加跳停策略和计算服务对象，未实现
|
2021-01-27 15:33:59 +08:00 |
|
|
|
2ddedd3134
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-26 18:41:56 +08:00 |
|
|
|
bf326074ad
|
修改取消进路时延时解锁条件
|
2021-01-26 18:41:51 +08:00 |
|
|
|
927b5bb83c
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-26 18:39:22 +08:00 |
|
|
|
51285bf767
|
客流策略流程和停站时间策略逻辑开发
|
2021-01-26 18:39:05 +08:00 |
|
DU
|
bf3bf28fad
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-01-26 16:21:45 +08:00 |
|
DU
|
44a7972427
|
实训生成修改
|
2021-01-26 16:21:32 +08:00 |
|
|
|
4322ed671e
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-26 14:32:29 +08:00 |
|
|
|
e92867a2bc
|
添加项目枚举
|
2021-01-26 14:32:08 +08:00 |
|
|
|
b678d3e103
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-26 13:18:17 +08:00 |
|
|
|
17abe86959
|
列车初始化bug修改；取消进路延时解锁条件修改；设头码车时查询路径逻辑修改
|
2021-01-26 13:18:10 +08:00 |
|
DU
|
d491b56ef3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-01-26 10:01:19 +08:00 |
|
DU
|
bd75dd9b3e
|
站间距计算修改
|
2021-01-26 10:01:08 +08:00 |
|
|
|
bb8a694132
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-26 09:12:20 +08:00 |
|
|
|
0aae6b66fc
|
Merge remote-tracking branch 'origin/passenger' into test
|
2021-01-26 09:01:51 +08:00 |
|
|
|
8911cfa6b1
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-25 19:44:37 +08:00 |
|
|
|
7d30ceb7de
|
列车添加倒车最大速度，列车运行逻辑对应修改
|
2021-01-25 19:44:32 +08:00 |
|
DU
|
d8897d80d7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-01-25 19:26:42 +08:00 |
|
DU
|
8deceb2a2c
|
站间距根据精确到停车点；
折返按钮状态保存
|
2021-01-25 19:26:31 +08:00 |
|
|
|
c159f9a8c1
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-25 19:13:35 +08:00 |
|
|
|
f4c16da685
|
碰撞检测bug修改
|
2021-01-25 19:13:23 +08:00 |
|
|
|
1f88489d3b
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-25 19:05:43 +08:00 |
|
|
|
1527a8ccf1
|
信号重复封锁逻辑修改
|
2021-01-25 19:05:30 +08:00 |
|
|
|
02d4d12933
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-25 18:45:46 +08:00 |
|
|
|
8459f38fc3
|
添加列车<倒车限速><碰撞检测逻辑>
|
2021-01-25 18:45:36 +08:00 |
|
|
|
5a53001eaf
|
信号重复封锁逻辑修改
|
2021-01-25 18:31:28 +08:00 |
|
DU
|
15462ece3a
|
站间距离修改
|
2021-01-25 17:48:06 +08:00 |
|
|
|
ebb8cfd55e
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-25 17:45:46 +08:00 |
|
DU
|
c26fb273e8
|
折返站的设置折返实训
|
2021-01-25 17:16:01 +08:00 |
|
DU
|
96acf9671b
|
运行等级的站间距离根据地图重新更新
|
2021-01-25 17:11:02 +08:00 |
|
DU
|
f3eb9096c4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-01-25 16:17:48 +08:00 |
|
|
|
4da39b13f2
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-25 16:14:23 +08:00 |
|
|
|
f05398e33c
|
信号重复封锁的检查区段改为第一个逻辑区段；<延续保护未锁闭>的移动授权改为<延续保护前100m|延续保护前一个区段距离更远的那个端点>
|
2021-01-25 16:13:57 +08:00 |
|
|
|
e5fe7c4dd3
|
联锁生成——延续保护和侧防生成道岔相关逻辑调整
仿真初始化进路状态添加侧防元素转换锁闭逻辑
进路服务修改侧防锁闭，道岔预先锁闭等逻辑
|
2021-01-25 16:13:21 +08:00 |
|
DU
|
e33afe5a10
|
更新站间运行等级也可修改距离
|
2021-01-25 15:44:10 +08:00 |
|
DU
|
a4e4dd92cf
|
西安二号线 车站设置折返线 实训
|
2021-01-25 15:19:54 +08:00 |
|
DU
|
36b509ff40
|
更新站间数据
|
2021-01-25 14:47:57 +08:00 |
|
|
|
5e2c83d565
|
信号重开逻辑修改
|
2021-01-25 14:47:46 +08:00 |
|
DU
|
04eb086254
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-01-25 14:12:00 +08:00 |
|
DU
|
3d99582eb1
|
组织用户关系更改
|
2021-01-25 14:11:45 +08:00 |
|
DU
|
7120e303be
|
成都三现地信号机自动控和人工控实训名字
|
2021-01-25 14:00:47 +08:00 |
|
|
|
4a4c5fa92f
|
修改车站字段类型
|
2021-01-25 13:29:32 +08:00 |
|
|
|
642fc17de5
|
列车移动授权计算对<屏蔽门开启>情况的处理逻辑修改；道岔、车站添加字段
|
2021-01-25 13:13:42 +08:00 |
|
|
|
2a8e87ce14
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-25 11:24:39 +08:00 |
|
|
|
68e57fa9b0
|
添加进路延续保护侧防锁闭和解锁逻辑
|
2021-01-25 11:24:20 +08:00 |
|
|
|
e351662dcc
|
添加挤岔恢复指令
|
2021-01-22 21:12:01 +08:00 |
|
|
|
efeda41423
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-22 20:48:27 +08:00 |
|
|
|
face2acfac
|
进路信号封锁联锁检查和开放逻辑修改
|
2021-01-22 20:48:14 +08:00 |
|
|
|
39af42d875
|
添加道岔计轴预复位的状态及处理逻辑
|
2021-01-22 20:38:36 +08:00 |
|
|
|
6e6e0a9ca7
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-22 18:58:29 +08:00 |
|
|
|
8a4e459b3e
|
客流停站时间策略逻辑开发
|
2021-01-22 18:58:14 +08:00 |
|
|
|
4e85d158e4
|
岔心强解bug修改
|
2021-01-22 18:26:26 +08:00 |
|
|
|
808d7c3ee9
|
修改道岔计轴区段的非通信车占用逻辑（ARB那里）
|
2021-01-22 18:15:10 +08:00 |
|
|
|
70b01e3f5f
|
修改开放引导信号时的判断信号机接近区段占用逻辑
|
2021-01-22 17:29:50 +08:00 |
|
|
|
8cc9e9f3d2
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-22 16:29:46 +08:00 |
|
|
|
dc6fc9345c
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-22 16:28:07 +08:00 |
|
|
|
8c9392bf14
|
修改ATS进路触发逻辑
修改进路排列如果进路已经锁闭直接返回
修改道岔单操逻辑bug
|
2021-01-22 16:27:46 +08:00 |
|
|
|
411d276baa
|
实现<区段预复位>操作
|
2021-01-22 15:10:21 +08:00 |
|
|
|
5eb20f669c
|
取消进路同时取消追踪模式；岔心关联区段锁闭时，岔心区段也锁闭
|
2021-01-21 19:30:18 +08:00 |
|
|
|
88331d6b72
|
道岔添加<挤岔>故障及逻辑；修改区故解和道岔区故解逻辑
|
2021-01-21 17:11:15 +08:00 |
|
|
|
f67542a5c2
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-21 16:16:45 +08:00 |
|
|
|
c747a67d59
|
ATS进路触发bug修改，添加进路服务日志
|
2021-01-21 16:09:38 +08:00 |
|
|
|
ff2e0e6f71
|
修改<进路交自动控><进路收人工控><办理引导>的逻辑；修改引导信号开启时间为30秒
|
2021-01-21 11:24:00 +08:00 |
|
|
|
6b843ad147
|
取消<区段占用进路不排列配置项>；修改<区段强解>逻辑；<查询需要排列的进路>逻辑中添加<触发进路检查>逻辑
|
2021-01-20 19:37:21 +08:00 |
|
|
|
da922a6e31
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-20 18:56:06 +08:00 |
|
|
|
c2d0137c28
|
添加进路排列检查失败日志打印
大客流策略流程
|
2021-01-20 18:55:53 +08:00 |
|
|
|
e0d549600d
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# src/main/java/club/joylink/rtss/simulation/cbtc/ATS/service/AtsSectionService.java
|
2021-01-20 16:40:45 +08:00 |
|
|
|
0f5932e1c1
|
修改实训生成bug；针对南京线路添加配置和逻辑
|
2021-01-20 16:03:55 +08:00 |
|
Jade
|
6f6a323d8d
|
客流列车到站上车调整
|
2021-01-20 15:23:46 +08:00 |
|
DU
|
df250b5c71
|
Merge
|
2021-01-20 09:55:00 +08:00 |
|
DU
|
d0c2ed8544
|
应答器逻辑修改
|
2021-01-20 09:13:33 +08:00 |
|
|
|
fef9896703
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-19 19:42:36 +08:00 |
|
|
|
60e7960728
|
联锁生成——延续保护解锁时间添加根据解锁区段长度计算的逻辑
|
2021-01-19 19:42:19 +08:00 |
|
|
|
a4e4884721
|
传输信号机不构建地图数据
|
2021-01-19 18:55:56 +08:00 |
|
|
|
e00262ceb9
|
传输信号机不生成联锁数据
|
2021-01-19 18:41:17 +08:00 |
|
|
|
52986aa9a2
|
将传输信号机联锁数据校验逻辑与其它信号机区分，添加传输信号机的构建逻辑
|
2021-01-19 18:11:44 +08:00 |
|
|
|
bad7cca595
|
进路正常解锁相关道岔解锁逻辑
|
2021-01-19 17:09:48 +08:00 |
|
|
|
fa3a17c63e
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-19 17:02:30 +08:00 |
|
|
|
3742523aee
|
实现<强扳道岔>操作；进路正常解锁道岔时，添加<尝试解锁联动道岔和计轴关联道岔>逻辑
|
2021-01-19 17:01:34 +08:00 |
|
|
|
d6a5120ccb
|
去掉<进路关联屏蔽门开门时关闭始端信号机>的逻辑
|
2021-01-19 14:34:17 +08:00 |
|
|
|
a60106dedc
|
屏蔽门关门去掉对信号机状态的检查
|
2021-01-19 13:32:25 +08:00 |
|
|
|
f0b8778bfb
|
去掉进路办理时对非CBTC进路的延续保护锁闭状态检查；添加<取消设置>操作；添加<传输信号机>绘图数据
|
2021-01-19 11:19:24 +08:00 |
|
|
|
25e16b83ea
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-19 10:37:07 +08:00 |
|
|
|
c2e1bca38c
|
ATS出库和折返进路触发问题修改
|
2021-01-19 10:36:48 +08:00 |
|
|
|
3b99e3f5ea
|
恢复并修改<进路经过的站台轨所属的站台的屏蔽门未关闭时，关闭信号机>为非CBTC级别下检查
|
2021-01-18 17:24:06 +08:00 |
|
|
|
ad529992af
|
信号机添加<所属车站>绘图属性；交出控制权添加<控制权所属校验>
|
2021-01-18 16:22:19 +08:00 |
|
|
|
35409a3901
|
进路封锁操作，取消<进路锁闭的区段不处理>的逻辑
|
2021-01-18 13:38:37 +08:00 |
|
|
|
426ae9f775
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-15 18:40:11 +08:00 |
|
|
|
843e2c94a5
|
联锁生成逻辑在生成侧防时，进路道岔生成bug修改
仿真（西门子）联锁逻辑完善，和调试
|
2021-01-15 18:39:57 +08:00 |
|
DU
|
1f82cf3deb
|
应答器逻辑补充
|
2021-01-15 17:06:58 +08:00 |
|
|
|
cfe95ad538
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-15 13:00:09 +08:00 |
|
DU
|
d399df63de
|
岔心校验bug
|
2021-01-15 11:11:24 +08:00 |
|
|
|
d65a01fcd9
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-15 11:04:42 +08:00 |
|
DU
|
413a025023
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-01-15 10:40:56 +08:00 |
|
DU
|
6b03677e54
|
岔心 应答器数据对象，应答器逻辑未完
|
2021-01-15 10:39:46 +08:00 |
|
|
|
45c349dff8
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-15 09:59:27 +08:00 |
|
|
|
1567647be2
|
微信支付
|
2021-01-15 09:59:01 +08:00 |
|
|
|
f29fadfbc6
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-14 19:07:51 +08:00 |
|
|
|
eeeec1db01
|
联锁侧防数据生成、保存、仿真构建流程调试修改
联锁进路控制添加侧防逻辑（延续保护侧防逻辑还没有加），触发区段使用逻辑区段
联锁进路信号机添加 "级别" 概念和逻辑
|
2021-01-14 19:07:32 +08:00 |
|
|
|
8eb906de23
|
联锁侧防数据生成、保存、仿真构建
|
2021-01-13 18:42:17 +08:00 |
|
DU
|
13f5dd8142
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-01-13 10:41:49 +08:00 |
|
DU
|
8f4d4cd9ea
|
地图草稿添加岔心 应答器；
点赞数据推送修db改
|
2021-01-13 10:41:26 +08:00 |
|
|
|
ca313ad48c
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-12 23:53:15 +08:00 |
|
|
|
edcdca23c5
|
添加侧防生成逻辑
|
2021-01-12 23:52:58 +08:00 |
|
|
|
0faa785f90
|
创建考试时的权限校验逻辑修改
|
2021-01-12 20:47:35 +08:00 |
|
DU
|
02078eb039
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-01-12 18:52:03 +08:00 |
|
DU
|
37c0cee2ae
|
考试创建同规则删除
|
2021-01-12 18:51:53 +08:00 |
|
|
|
4c23708d14
|
添加考试的权限校验
|
2021-01-12 18:12:50 +08:00 |
|
|
|
62739021be
|
仿真权限校验bug修改
|
2021-01-12 16:12:38 +08:00 |
|
|
|
2e77fd784c
|
仿真修改权限校验逻辑
|
2021-01-12 14:58:08 +08:00 |
|
DU
|
ca4caa64f9
|
单位增加关联项目code
|
2021-01-12 14:02:32 +08:00 |
|
DU
|
e0c23c1e2c
|
删除考试代码bug
|
2021-01-12 13:34:10 +08:00 |
|
DU
|
15d4702873
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1
|
2021-01-12 11:45:03 +08:00 |
|
DU
|
015adfcc95
|
教学相关修改
|
2021-01-12 11:44:35 +08:00 |
|
|
|
92a2d39318
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-11 20:09:59 +08:00 |
|
|
|
b6c1672542
|
列车移动曲线计算兼容逻辑区段限速
|
2021-01-11 20:09:52 +08:00 |
|
DU
|
ec6cb89ce0
|
教学bug
|
2021-01-11 20:02:12 +08:00 |
|
DU
|
d72beb1e93
|
Merge remote-tracking branch 'origin/test' into test1
|
2021-01-11 17:37:49 +08:00 |
|
DU
|
d0284659d8
|
课程考试关联班级修改
|
2021-01-11 17:32:24 +08:00 |
|
DU
|
d0907a8d06
|
Revert "Revert "默认课程考试不分是否所属单位始终展示""
This reverts commit 537d2a68
|
2021-01-11 17:31:48 +08:00 |
|
DU
|
88c79ab763
|
Revert "Revert "单位部门成员数据管理关联课程考试""
This reverts commit f9a541f4
|
2021-01-11 17:31:28 +08:00 |
|
|
|
4f950543dd
|
用戶连接司机视角后发送一次列车完整hmi数据，否则第一次进司机视角列车状态显示不正确
|
2021-01-11 16:37:42 +08:00 |
|
|
|
2618913522
|
修改<从发布地图新建草稿没有复制目的地码数据>bug
|
2021-01-11 11:27:28 +08:00 |
|
|
|
f5f8df1e28
|
苏电院初始化时关闭响铃
|
2021-01-10 20:35:40 +08:00 |
|
|
|
cbde7f7e40
|
苏电院真实设备逻辑修改
|
2021-01-10 16:23:31 +08:00 |
|
|
|
f9a541f492
|
Revert "单位部门成员数据管理关联课程考试"
This reverts commit c6f0df8b
|
2021-01-09 20:16:18 +08:00 |
|
|
|
537d2a68f5
|
Revert "默认课程考试不分是否所属单位始终展示"
This reverts commit 5d65b4d5
|
2021-01-09 20:15:50 +08:00 |
|
|
|
6caf775a8e
|
Merge remote-tracking branch 'origin/test' into master-huawei
|
2021-01-09 19:51:21 +08:00 |
|
|
|
1d3409fb45
|
苏电院修改响铃时长
|
2021-01-09 19:47:54 +08:00 |
|
|
|
f49d344553
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-09 19:26:57 +08:00 |
|
|
|
88de80d11b
|
苏电院真实设备逻辑修改
|
2021-01-09 19:26:41 +08:00 |
|
DU
|
5d65b4d50d
|
默认课程考试不分是否所属单位始终展示
|
2021-01-08 18:09:47 +08:00 |
|
DU
|
c6f0df8b18
|
单位部门成员数据管理关联课程考试
|
2021-01-08 18:00:51 +08:00 |
|
|
|
fdd51383f4
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-08 15:32:06 +08:00 |
|
DU
|
8b64fde956
|
仿真会话bug修复
|
2021-01-07 19:33:01 +08:00 |
|
DU
|
61f2003f27
|
Merge remote-tracking branch 'origin/test' into test
|
2021-01-07 09:28:04 +08:00 |
|
DU
|
0ceee901a6
|
iscs加数据判断接口，车站实训生成背景更换，自动故障列车到达区段条件修改
|
2021-01-07 09:15:14 +08:00 |
|
|
|
39482d6b1d
|
苏电院屏蔽门调试
|
2021-01-05 17:47:55 +08:00 |
|
|
|
fa376fdfa3
|
Merge branch 'test' into restruct
|
2021-01-04 18:23:51 +08:00 |
|
|
|
c94ad846ce
|
仿真真实设备模拟逻辑开发
|
2021-01-04 18:22:14 +08:00 |
|
|
|
df1f83c789
|
Merge remote-tracking branch 'origin/test' into master-huawei
|
2020-12-31 18:23:58 +08:00 |
|
|
|
13cc8e9bf8
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-31 18:23:23 +08:00 |
|
|
|
50fb1fc564
|
仿真抽象
|
2020-12-31 18:22:58 +08:00 |
|
|
|
7fad4fd3ae
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/club/joylink/rtss/wechat/MiniProgramAccessTokenManager.java
# src/main/java/club/joylink/rtss/wechat/MiniProgramServiceImpl.java
|
2020-12-31 18:21:41 +08:00 |
|
DU
|
d1e339a307
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-31 18:01:26 +08:00 |
|
DU
|
2434905228
|
实训适配新操作
|
2020-12-31 18:01:09 +08:00 |
|
|
|
f473304fe6
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-31 16:30:17 +08:00 |
|
|
|
32bb3e691e
|
控制模式判断bug修改
|
2020-12-31 16:30:02 +08:00 |
|
DU
|
2149d85ede
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-31 13:45:22 +08:00 |
|
DU
|
55e2731634
|
试卷过期查询bug修改
|
2020-12-31 13:44:59 +08:00 |
|
|
|
0a53d304aa
|
导入导出添加ISCS数据
|
2020-12-31 09:53:03 +08:00 |
|
|
|
57c9fcc04f
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-30 16:52:38 +08:00 |
|
|
|
eadc8ccc8c
|
删除用户配置表数据库相关对象和相关接口
|
2020-12-30 16:51:50 +08:00 |
|
|
|
a25e3dc6f2
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-30 16:18:02 +08:00 |
|
|
|
6cac955c4c
|
国赛场景添加权限控制
|
2020-12-30 16:17:51 +08:00 |
|
|
|
9aa83aab76
|
Merge remote-tracking branch 'origin/test' into master-huawei
|
2020-12-30 14:39:11 +08:00 |
|
|
|
9426e4ddeb
|
修改微信服务获取token接口调用
|
2020-12-30 14:38:51 +08:00 |
|
|
|
21406a1726
|
修改文件上传路径
|
2020-12-30 14:37:19 +08:00 |
|
|
|
4127d7d58b
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-30 11:00:58 +08:00 |
|
|
|
d93934d9da
|
修改微信服务获取token接口调用
|
2020-12-30 11:00:27 +08:00 |
|
DU
|
ae12063980
|
试卷定义列表名称查询bug修改
|
2020-12-30 10:58:25 +08:00 |
|
|
|
7dd24fd938
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-30 10:42:52 +08:00 |
|
|
|
fc692f8040
|
运行图版本更新bug修改
|
2020-12-30 10:41:28 +08:00 |
|
DU
|
c9a0d8bc8f
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-30 09:52:13 +08:00 |
|
DU
|
636432d6f9
|
复制运行计划bug修改
|
2020-12-30 09:51:11 +08:00 |
|
|
|
0bc894d2b9
|
Merge remote-tracking branch 'origin/test' into master-huawei
|
2020-12-30 09:18:32 +08:00 |
|
|
|
8161216321
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-30 09:17:37 +08:00 |
|
|
|
1745fcd5e0
|
修改邮件发送问题
|
2020-12-30 09:17:22 +08:00 |
|
DU
|
070dd06805
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-30 09:04:24 +08:00 |
|
|
|
2e2d58d992
|
Merge remote-tracking branch 'origin/test' into master-huawei
|
2020-12-29 18:39:20 +08:00 |
|
|
|
4628dc3fcb
|
修改小程序access_token获取
|
2020-12-29 18:37:29 +08:00 |
|
|
|
3d7fd9a5c2
|
抽象仿真，重构
|
2020-12-29 18:34:10 +08:00 |
|
|
|
07252b5fea
|
修改小程序access_token获取
|
2020-12-29 18:30:50 +08:00 |
|
DU
|
c9c4c20da9
|
修改运行图绘制bug
|
2020-12-29 18:19:59 +08:00 |
|
|
|
d50431919c
|
ISCS复制接口修改
|
2020-12-29 17:08:43 +08:00 |
|
|
|
78e222b297
|
实训生成bug修改
|
2020-12-29 13:59:18 +08:00 |
|
|
|
a5326da09c
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-29 10:31:40 +08:00 |
|
|
|
3b811d1d40
|
发布的ibp、iscs数据管理；ibp紧急停车bug修改
|
2020-12-29 10:31:24 +08:00 |
|
|
|
b4c3e458f0
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-28 14:33:56 +08:00 |
|
|
|
34fc686f4d
|
仿真列车出库时间调整为提前5分钟
列车折返进路办理添加是否存在冲突出库计划判断
|
2020-12-28 14:33:35 +08:00 |
|
|
|
7a45660493
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-28 13:58:20 +08:00 |
|
|
|
2fb256cf0e
|
ibp紧急停车按钮逻辑
|
2020-12-28 13:58:00 +08:00 |
|
DU
|
a8e2e0afaf
|
宁波三-两运行图导入修改；
指令定义分页查询增加仿真角色条件
|
2020-12-25 14:27:30 +08:00 |
|
|
|
f8abb9eddc
|
代码格式化
|
2020-12-25 09:01:43 +08:00 |
|
|
|
db657689bf
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-24 18:46:16 +08:00 |
|
|
|
9360fd5020
|
实训生成后原有课程恢复
|
2020-12-24 18:45:57 +08:00 |
|
DU
|
34f6cb7deb
|
宁波三运行图导入-工作日+双休日 （待测）
|
2020-12-24 18:28:55 +08:00 |
|
DU
|
8f748e6323
|
用户交路定义增加生成通用路径，
|
2020-12-23 19:04:01 +08:00 |
|
DU
|
ea7eb75078
|
运行图检查错误提示修改
|
2020-12-23 16:01:10 +08:00 |
|
DU
|
660a42ffe0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2020-12-23 15:12:17 +08:00 |
|
DU
|
cc5fd83f60
|
运行图生成防止时间跨过次日凌晨2点
|
2020-12-23 15:11:05 +08:00 |
|
|
|
c61ac54e2b
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-23 09:13:32 +08:00 |
|
|
|
aab1348b33
|
商品更新bug修改
|
2020-12-22 18:19:43 +08:00 |
|
DU
|
0c343028b2
|
添加清空运行图车次数据
|
2020-12-22 16:31:14 +08:00 |
|
DU
|
284aeadb67
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2020-12-22 15:11:48 +08:00 |
|
DU
|
a56448403d
|
平移单个服务计划
|
2020-12-22 15:11:35 +08:00 |
|
|
|
6c5713bfda
|
删除<RM模式下触发EB不生效>逻辑
|
2020-12-22 14:21:07 +08:00 |
|
|
|
ac22b5c8c7
|
列车添加<控制杆拉到快速制动位可以缓解信号EB>逻辑
|
2020-12-22 14:13:21 +08:00 |
|
|
|
52d0218305
|
留言板管理增加编辑功能
|
2020-12-22 13:47:37 +08:00 |
|
|
|
01b39f4129
|
运行至前方站步骤参数修改
|
2020-12-22 13:25:52 +08:00 |
|
|
|
730e245985
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-22 13:21:24 +08:00 |
|
|
|
da35d772bd
|
zc故障不停车bug修改；运行至前方站指令流程修改
|
2020-12-22 13:20:46 +08:00 |
|
DU
|
1a7deb1c0c
|
仿真操作异常添加提示
|
2020-12-22 10:55:21 +08:00 |
|
|
|
fbd2d01e07
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-21 22:27:02 +08:00 |
|
|
|
794d8a0a0a
|
联锁机故障取消逻辑调整（哈尔滨）
|
2020-12-21 22:24:56 +08:00 |
|
|
|
3dd75b34c2
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-21 22:15:26 +08:00 |
|
|
|
e3cee9cfbe
|
联锁机故障（哈尔滨）
|
2020-12-21 22:14:43 +08:00 |
|
|
|
57809890c8
|
办理过的进路不再办理
|
2020-12-21 19:01:02 +08:00 |
|
|
|
7e9ec11e76
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-21 18:41:57 +08:00 |
|
|
|
e7114802cb
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-21 17:59:56 +08:00 |
|
|
|
5ea8b122eb
|
ATS进路排列逻辑，已经或正在排列的进路不再重复排列
|
2020-12-21 17:59:42 +08:00 |
|
|
|
daf2d16cb7
|
仿真背景增加字段
|
2020-12-21 16:55:03 +08:00 |
|
DU
|
4353dd014e
|
导入运行图异常断言bug修复
|
2020-12-21 13:04:35 +08:00 |
|
DU
|
301ed565d1
|
个人停站时间数据判重逻辑修改
|
2020-12-21 09:16:18 +08:00 |
|
|
|
ab8fa3c3c0
|
修改华为正式数据库路径配置
|
2020-12-20 10:55:09 +08:00 |
|
|
|
c36f7ab639
|
调整查询进路路径计算逻辑
修改列车站台控制逻辑兼容无出站信号机站台
修改其他发现bug
|
2020-12-19 22:29:44 +08:00 |
|
|
|
d8f15148c8
|
哈尔滨问题去掉多余修改
|
2020-12-18 21:53:40 +08:00 |
|
|
|
744f446b56
|
哈尔滨问题修改
|
2020-12-18 21:47:20 +08:00 |
|
|
|
3b8b79e9e6
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-17 21:46:45 +08:00 |
|
|
|
8a3ab0fc25
|
修改本地打包配置
|
2020-12-17 21:46:26 +08:00 |
|
|
|
b18ad86fc6
|
Revert "仿真运行中前后车次间隔时间不连续时需等待发车"
This reverts commit 5248236d
|
2020-12-17 20:42:09 +08:00 |
|
|
|
f0ef8308f1
|
贵装备查询默认课程bug修改
|
2020-12-17 18:45:28 +08:00 |
|
|
|
ff8427781b
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-17 18:23:09 +08:00 |
|
|
|
0cd9867530
|
哈尔滨问题：日志、信号机灯丝熔断故障
|
2020-12-17 18:22:55 +08:00 |
|
DU
|
5248236d7d
|
仿真运行中前后车次间隔时间不连续时需等待发车
|
2020-12-17 17:40:49 +08:00 |
|
DU
|
5d94ef018a
|
课程重新发布覆盖之前关联的班级关系；
地图基础数据：绘图元素 Text Line OutFrame 都加个 stationCode 参数
|
2020-12-17 15:18:00 +08:00 |
|
|
|
252a9ec9ed
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-17 15:01:18 +08:00 |
|
|
|
b572151bc4
|
留言板管理功能
|
2020-12-17 14:58:19 +08:00 |
|
|
|
407b123162
|
<删除考试>报错信息修改
|
2020-12-17 14:57:16 +08:00 |
|
|
|
fe9e9c18d5
|
删除考试报错信息修改
|
2020-12-17 11:23:46 +08:00 |
|
|
|
b05336cee7
|
开始考试bug修改
|
2020-12-17 10:44:16 +08:00 |
|
DU
|
4c8c75fdb2
|
默认课程可重新发布且贵装备学生查询默认课程修改
|
2020-12-17 09:36:34 +08:00 |
|
DU
|
a8a0450093
|
修改编制计划bug
|
2020-12-16 18:29:13 +08:00 |
|
DU
|
2a77963a17
|
客流不变化仿真不变
|
2020-12-16 16:44:06 +08:00 |
|
DU
|
a482b24299
|
ibp盘加通用数据
|
2020-12-16 16:07:33 +08:00 |
|
DU
|
bf2bfe919b
|
修改sql
|
2020-12-16 13:59:35 +08:00 |
|
DU
|
14fdf7cfb3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2020-12-16 13:17:53 +08:00 |
|
DU
|
2a621e816d
|
客流数据切换，目前未关联对应车次运行图
|
2020-12-16 13:17:44 +08:00 |
|
|
|
99eab1c0d9
|
仿真日志添加注解
|
2020-12-16 13:11:59 +08:00 |
|
|
|
cd08b456fe
|
站间分割对象添加显示条件
|
2020-12-16 11:24:00 +08:00 |
|
|
|
747358df0d
|
仿真记录操作日志
|
2020-12-16 11:12:14 +08:00 |
|
|
|
a8214ae152
|
生成目的地码逻辑修改
|
2020-12-16 11:03:22 +08:00 |
|
|
|
d0b9c4e114
|
仿真基础信息中加入运行图基本信息，前端根据运行图信息做缓存
|
2020-12-16 09:17:54 +08:00 |
|
|
|
8a737f5af4
|
方法名修改
|
2020-12-15 14:11:09 +08:00 |
|
|
|
8fccb0b712
|
mapInfo批量插入添加version字段
|
2020-12-15 14:06:52 +08:00 |
|
|
|
d266d3a6bc
|
修改方法名
|
2020-12-15 10:15:37 +08:00 |
|
|
|
64c6261939
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-14 20:19:58 +08:00 |
|
|
|
01f10737cf
|
生成本地用户接口调整，直接获取本地所有地图权限10个
直接获取地图权限接口删除组织逻辑
|
2020-12-14 19:41:48 +08:00 |
|
|
|
0459d0facc
|
gzb查询默认课程bug修改
|
2020-12-14 19:40:43 +08:00 |
|
|
|
d33798184d
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-14 18:05:48 +08:00 |
|
|
|
06d340a72c
|
本地导入bug修改
|
2020-12-14 18:05:15 +08:00 |
|
|
|
f74d379ed9
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-14 17:16:19 +08:00 |
|
|
|
f2bea7bed0
|
<一键创建项目下所有地图的权限分发>接口自动给没有权限的地图生成权限
|
2020-12-14 17:16:04 +08:00 |
|
DU
|
565c5ee466
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2020-12-14 17:10:12 +08:00 |
|
DU
|
02288c9301
|
班级学生也显示默认课程
|
2020-12-14 17:10:01 +08:00 |
|
|
|
4e5cd4dce4
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-14 16:41:00 +08:00 |
|
|
|
98ec6a2453
|
添加<一键创建项目下所有地图的权限分发>接口
|
2020-12-14 16:28:56 +08:00 |
|
|
|
f1ed0d632f
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-14 14:41:58 +08:00 |
|
|
|
9cfab25c4d
|
修改TDT消息变化采集bug
|
2020-12-14 14:41:42 +08:00 |
|
DU
|
d2d4b2deef
|
添加运行图有效性检查
|
2020-12-14 14:13:08 +08:00 |
|
DU
|
b169974ccf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2020-12-14 13:19:05 +08:00 |
|
DU
|
24ece695d2
|
查询用户交路bug
|
2020-12-14 13:18:57 +08:00 |
|
|
|
5ba18b5061
|
仿真基础信息添加错误消息列表
|
2020-12-14 13:14:55 +08:00 |
|
|
|
43183365cf
|
项目地图查询根据order_number排序
|
2020-12-11 21:51:13 +08:00 |
|
|
|
9da15bf9f9
|
发布地图分页查询添加按id排序
|
2020-12-11 21:22:42 +08:00 |
|
|
|
806d6c6e67
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-11 17:49:31 +08:00 |
|
|
|
b552d94f38
|
恢复<查询销售人员>接口
|
2020-12-11 17:49:16 +08:00 |
|
DU
|
28170a5c4c
|
删除冗余代码
|
2020-12-11 15:37:48 +08:00 |
|
DU
|
f9fc629889
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2020-12-11 15:33:29 +08:00 |
|
DU
|
ea90bc3d8b
|
通用单一环路平稳运行图
|
2020-12-11 15:33:16 +08:00 |
|
|
|
ba2d75c0c0
|
添加配置<当进路的区段占用时不排列进路>
|
2020-12-11 15:31:45 +08:00 |
|
|
|
9911d0e109
|
运行图加载计划查询bug修改
|
2020-12-11 13:37:38 +08:00 |
|
|
|
3cd7d4f58d
|
联锁生成进路bug修改
|
2020-12-11 11:07:48 +08:00 |
|
|
|
eaf72d9b54
|
运行图加载计划只查有效的地图
|
2020-12-11 10:32:41 +08:00 |
|
|
|
5c41dae39b
|
<发布地图根据线路查询无效>bug修改
|
2020-12-11 09:58:49 +08:00 |
|
|
|
b1e4191cea
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-11 09:55:34 +08:00 |
|
|
|
dbe2f83432
|
联锁数据生成添加<目的地码生成>，去掉<交路数据生成>；头码车逻辑兼容新目的地码数据；剧本保存添加头码车路径；<筛选头码车需要排列的进路>逻辑修改；<将计划车设为头码车不生效（西安二）>逻辑注掉
|
2020-12-11 09:55:15 +08:00 |
|
|
|
4d01d007d5
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-11 09:12:38 +08:00 |
|
|
|
c40fea8010
|
添加项目
|
2020-12-11 09:12:10 +08:00 |
|
DU
|
3e6bd50e11
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2020-12-10 18:46:24 +08:00 |
|
DU
|
5e0b042511
|
生成计划折返时间设置
|
2020-12-10 18:46:16 +08:00 |
|
|
|
98462a479f
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-10 18:17:22 +08:00 |
|
|
|
c6fff22312
|
添加三维站台TDT状态收集发送
|
2020-12-10 18:17:10 +08:00 |
|
DU
|
38149a54dc
|
生成多个同运营路线服务计划
|
2020-12-10 17:57:13 +08:00 |
|
|
|
6f09c205b0
|
修改ATS自动触发进路bug
|
2020-12-10 17:24:10 +08:00 |
|
|
|
3e11fe642a
|
添加根据加载计划复制到指定地图功能接口
|
2020-12-10 15:55:41 +08:00 |
|
|
|
1924deac9c
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-10 15:39:01 +08:00 |
|
|
|
2d3a2f25ee
|
添加根据地图一键领权限功能
|
2020-12-10 15:38:41 +08:00 |
|
|
|
465ceed601
|
修改进路延续保护重新锁闭条件判断逻辑
|
2020-12-10 13:58:19 +08:00 |
|
|
|
b1db9d64f8
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-09 19:20:33 +08:00 |
|
|
|
498d2b3079
|
进路是否直向进路判断逻辑修改——取消延续保护的判断
|
2020-12-09 19:19:44 +08:00 |
|
DU
|
14f4a94c58
|
补充提交
|
2020-12-09 16:56:44 +08:00 |
|
DU
|
0590008813
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2020-12-09 16:52:38 +08:00 |
|
DU
|
468d641a1f
|
运行图根据出入库及环路生成单个计划数据
|
2020-12-09 16:52:29 +08:00 |
|
|
|
c802b2115f
|
列车站间运行速度控制删除站台时间考虑
列车停站时间逻辑微调
列车区间通信故障然后恢复进路锁闭光带缺失问题修复
|
2020-12-09 13:30:40 +08:00 |
|
|
|
8500f89b5c
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-08 19:32:27 +08:00 |
|
|
|
b148976759
|
修改列车停站时间计算逻辑
修改列车站台停车关门时机逻辑
修改ITC移动授权计算位置为信号机前5米
修改ATS进路触发西门子类进路bug，修改折返进路触发时机
修改备用车更新车次时机
修改进路延续保护解锁bug
|
2020-12-08 19:32:12 +08:00 |
|
|
|
9562c726e3
|
仿真使用情况记录
|
2020-12-08 11:23:35 +08:00 |
|
|
|
15166c7fbd
|
Merge branch 'master' into test
|
2020-12-07 19:23:22 +08:00 |
|
|
|
29875967a6
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-07 15:27:01 +08:00 |
|
|
|
ad822784d5
|
仿真数据校验bug修改
|
2020-12-07 15:26:32 +08:00 |
|
|
|
fcea49db2b
|
客流添加列车PIS消息
|
2020-12-07 14:55:03 +08:00 |
|
|
|
90ba9c9696
|
用户管理分页查询sql bug修改
|
2020-12-07 10:40:52 +08:00 |
|
|
|
a7a58a5abc
|
Merge remote-tracking branch 'origin/test'
|
2020-12-04 20:59:29 +08:00 |
|
|
|
f73148c5a3
|
生成实训不删除用户考试数据
|
2020-12-04 20:58:08 +08:00 |
|
|
|
cbdb41ac0d
|
Merge remote-tracking branch 'origin/test'
|
2020-12-04 20:12:38 +08:00 |
|
|
|
b4876fa189
|
生成课程、考试时：如果课程下有试卷，不生成试卷；如果没有试卷，生成默认试卷
|
2020-12-04 20:10:58 +08:00 |
|
|
|
64f5ec3d7b
|
接收/交出控制权：整个集中站范围内的车站一起
|
2020-12-04 17:06:30 +08:00 |
|
|
|
712b08d450
|
用户管理界面更新用户信息bug修改
|
2020-12-03 19:57:26 +08:00 |
|
|
|
e799f3c5da
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# sql/20201203.sql
# src/main/java/club/joylink/rtss/services/training/generatornew/base/SignalGeneratorNew.java
|
2020-12-03 19:22:24 +08:00 |
|
|
|
d4e31b01e0
|
用户和单位
|
2020-12-03 19:19:24 +08:00 |
|
|
|
ea86955e6f
|
引导进路办理实训不生成
|
2020-12-03 19:18:13 +08:00 |
|
DU
|
b2f6c6a71d
|
实训bug相关修改
|
2020-12-03 11:01:50 +08:00 |
|
|
|
2eb8da551d
|
贵州装备导入学生自动给权限（一年，由赵杰分发）
|
2020-12-02 18:34:43 +08:00 |
|
|
|
fd869b3ed7
|
公司添加管理者逻辑bug修改
|
2020-12-02 16:09:33 +08:00 |
|
|
|
708ffdeb3c
|
公司查询逻辑bug修改
|
2020-12-02 15:34:05 +08:00 |
|
|
|
16946294a1
|
添加公司管理员
|
2020-12-02 12:03:30 +08:00 |
|
DU
|
f74b5822ba
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2020-12-02 09:39:13 +08:00 |
|
DU
|
5c257f5745
|
用户查询增加单位项
|
2020-12-02 09:39:04 +08:00 |
|
|
|
b72588b6ab
|
Merge remote-tracking branch 'origin/test' into test
|
2020-12-01 19:05:58 +08:00 |
|
|
|
ed00cee495
|
联锁生成逻辑——侧防数据生成逻辑开发（未完成）
|
2020-12-01 19:05:40 +08:00 |
|
DU
|
083ba77f99
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test
|
2020-12-01 18:36:13 +08:00 |
|
DU
|
f2a137379b
|
导入试题提示修改
|
2020-12-01 18:36:04 +08:00 |
|
|
|
7fe6e84da3
|
微信小程序code过期错误类型修改
|
2020-12-01 14:24:09 +08:00 |
|
|
|
dbfd391799
|
分页查询用户信息添加单位名称字段
|
2020-11-30 17:51:22 +08:00 |
|
|
|
5eddc4d8e0
|
《实训生成时，未根据prdType筛选》bug修改（考试开始的bug同时消除）；开始考试效率优化
|
2020-11-30 17:12:54 +08:00 |
|
|
|
bbeaa73c14
|
添加根据地图查绘图数据接口
|
2020-11-27 18:13:38 +08:00 |
|
|
|
ab03faa02b
|
根据mapId获取地图数据接口修改
|
2020-11-27 17:49:24 +08:00 |
|
|
|
f564935c40
|
理论题导入bug修改
|
2020-11-27 17:18:23 +08:00 |
|
|
|
34c1616a4c
|
理论题导入bug修改
|
2020-11-27 17:00:52 +08:00 |
|
|
|
5d743425e5
|
生成课程速度优化
|
2020-11-27 16:11:05 +08:00 |
|
|
|
91e23f39fc
|
信号机自排关和进路自动触发实训生成逻辑分开
|
2020-11-27 15:06:02 +08:00 |
|
|
|
76df1f7cd0
|
Merge branch 'training-bug' into test
|
2020-11-27 14:11:28 +08:00 |
|
|
|
788988a3e6
|
添加客流视图开关及通信流程
|
2020-11-27 14:04:22 +08:00 |
|
|
|
f2ad219264
|
实训生成bug修改；课程&考试生成去掉没有实训的章节
|
2020-11-27 13:16:20 +08:00 |
|
|
|
a2ca5c5981
|
信号总取消操作修改；课程查询逻辑修改
|
2020-11-26 19:03:32 +08:00 |
|
|
|
ac6a2750df
|
Merge remote-tracking branch 'origin/test' into test
|
2020-11-26 18:18:32 +08:00 |
|
|
|
0afb167ca7
|
语音文件添加类型
|
2020-11-26 18:18:17 +08:00 |
|
|
|
215a6bafd0
|
Merge remote-tracking branch 'origin/test' into test
|
2020-11-26 18:10:32 +08:00 |
|
|
|
9e4d63f3c2
|
仿真websocket订阅重构，同时修复仿真上线/下线事件逻辑，应该不会再出现进入大屏再关闭大屏标签页导致用户下线继而导致仿真销毁问题
仿真抽象对象添加抽象仿真用户
|
2020-11-26 18:10:16 +08:00 |
|
|
|
5892cad910
|
语音文件上传保存bug修改
|
2020-11-26 14:16:21 +08:00 |
|
|
|
13ddd0f01a
|
Merge remote-tracking branch 'origin/test' into test
|
2020-11-26 13:49:04 +08:00 |
|
|
|
ed6c7809ac
|
语音识别的文件保存的bug修改；本地部署的导入导出修改（未测试）
|
2020-11-26 13:48:48 +08:00 |
|
|
|
a6e8c3cc49
|
删除无用线程池配置，修改使用线程池核心数量
|
2020-11-26 13:35:24 +08:00 |
|
|
|
6292dee955
|
Merge remote-tracking branch 'origin/test' into test
|
2020-11-26 09:34:56 +08:00 |
|
|
|
b303ec5694
|
迁移微信接口消息转换器和配置
|
2020-11-26 09:34:39 +08:00 |
|
|
|
ab2270cc99
|
语音文件上传bug修改
|
2020-11-25 19:31:31 +08:00 |
|
|
|
d2ec25cfb0
|
语音文件上传正式
|
2020-11-25 18:26:15 +08:00 |
|
|
|
de5fa9030f
|
Merge remote-tracking branch 'origin/test' into test
|
2020-11-25 16:38:27 +08:00 |
|
|
|
5cd012cc66
|
实训流程修改&贵装备课程查询逻辑修改
|
2020-11-25 16:38:17 +08:00 |
|
|
|
d9eb31e884
|
地图数据保存历史版本相关功能修正
|
2020-11-25 11:05:39 +08:00 |
|
|
|
2d6b93009b
|
修改信号机生成实训逻辑——兼容哈尔滨操作
抽象仿真对象添加移除任务功能
|
2020-11-25 10:57:27 +08:00 |
|
|
|
fbaadf8ae8
|
删除地图版本xml文件
|
2020-11-24 19:06:09 +08:00 |
|
|
|
8b1f35406f
|
实训一键生成bug修改
|
2020-11-24 15:17:26 +08:00 |
|
|
|
3b7dcaeada
|
Merge branch 'master' into test
|
2020-11-24 14:33:43 +08:00 |
|
|
|
04d44bab3e
|
地图数据版本相关（记录、更新等）（导入导出和其它一些用的地图数据的地方还没做处理）
|
2020-11-24 13:04:37 +08:00 |
|
|
|
f05737ca56
|
task移植
|
2020-11-23 19:23:42 +08:00 |
|
|
|
94a59c86a9
|
Merge remote-tracking branch 'origin/master'
|
2020-11-23 17:00:00 +08:00 |
|
|
|
590f36e4ce
|
用户仿真统计接口迁移
|
2020-11-23 16:58:53 +08:00 |
|
|
|
ec806b5780
|
添加构建文件
|
2020-11-20 17:23:55 +08:00 |
|
|
|
6dc2e56d4c
|
文件/代码，删除/位置调整
|
2020-11-20 14:42:46 +08:00 |
|
|
|
9114e56582
|
监听器和语音识别bug修改
|
2020-11-20 13:04:27 +08:00 |
|
|
|
132246ae49
|
报错消除
|
2020-11-20 09:07:46 +08:00 |
|
|
|
248413ef2e
|
追commit
|
2020-11-19 19:53:12 +08:00 |
|
|
|
5552022eb8
|
bug修改
|
2020-11-19 19:20:50 +08:00 |
|
|
|
cfa404807c
|
Merge remote-tracking branch 'origin/master'
|
2020-11-19 19:08:19 +08:00 |
|
|
|
3fffeaa6d6
|
报错消除（完）
|
2020-11-19 19:08:03 +08:00 |
|
|
|
efc94c813f
|
轨道交通项目迁出问题修改6(日志配置修改)
|
2020-11-19 19:06:53 +08:00 |
|
|
|
0a066a3f95
|
轨道交通项目迁出问题修改5(数据库访问修改)
|
2020-11-19 18:28:54 +08:00 |
|
|
|
1073fc66b6
|
轨道交通项目迁出问题修改4(可以启动了)
|
2020-11-19 18:12:24 +08:00 |
|
|
|
413a2c2b94
|
报错消除（未完）
|
2020-11-19 17:56:12 +08:00 |
|
|
|
bcc570afe9
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/club/joylink/rtss/services/MessagePushService.java
# src/main/java/club/joylink/rtss/services/draftData/DraftIbpServiceImpl.java
# src/main/java/club/joylink/rtss/services/draftData/DraftMapCiDataGeneratorImpl.java
# src/main/java/club/joylink/rtss/services/draftData/DraftMapFlankProtectionServiceImpl.java
# src/main/java/club/joylink/rtss/services/draftData/DraftMapRunLevelServiceImpl.java
|
2020-11-19 17:33:08 +08:00 |
|
|
|
88e49ce5b0
|
报错消除（未完）
|
2020-11-19 17:31:26 +08:00 |
|
|
|
3495375246
|
轨道交通项目迁出问题修改3
|
2020-11-19 17:28:47 +08:00 |
|
|
|
4f0dd338dd
|
轨道交通项目迁出问题修改2
|
2020-11-19 16:58:43 +08:00 |
|
|
|
d761ef143b
|
报错消除（未完）
|
2020-11-19 15:59:53 +08:00 |
|
|
|
4598550fb3
|
轨道交通项目迁出问题修改
|
2020-11-19 15:13:06 +08:00 |
|
|
|
d1b2d4fde0
|
Merge remote-tracking branch 'origin/master'
|
2020-11-19 13:58:44 +08:00 |
|
|
|
9774912108
|
轨道交通项目迁出问题修改
|
2020-11-19 13:58:24 +08:00 |
|
|
|
bb26bfeec9
|
报错消除（未完）
|
2020-11-19 13:57:58 +08:00 |
|
|
|
4cc89f9c2d
|
轨道交通项目迁出
|
2020-11-19 10:07:10 +08:00 |
|
|
|
ee5c36469d
|
轨道交通项目迁出
|
2020-11-19 10:05:24 +08:00 |
|
