Commit Graph

1699 Commits

Author SHA1 Message Date
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