Commit Graph

142 Commits

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