|
|
9da15bf9f9
|
发布地图分页查询添加按id排序
|
2020-12-11 21:22:42 +08:00 |
|
|
|
84fb648992
|
Merge remote-tracking branch 'origin/test'
|
2020-12-11 20:20:30 +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 |
|
|
|
bfdede9f5f
|
Merge remote-tracking branch 'origin/test'
|
2020-12-07 19:24:44 +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 |
|
